From 8860453b6bdef70a4562180e8f74051cd3e39851 Mon Sep 17 00:00:00 2001 From: sjeam <359824901@qq.com> Date: Sat, 6 Sep 2025 17:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/index.vue | 80 ++++++++++++++--------- src/pages/my/components/wx-login.vue | 2 + src/pages/my/setting.vue | 42 ++++++------ src/service/crmeb/product.ts | 5 ++ src/static/icons/agriculture_course.png | Bin 1664 -> 0 bytes src/static/icons/agriculture_service.png | Bin 1718 -> 0 bytes src/static/icons/home1.png | Bin 0 -> 3056 bytes src/static/icons/home2.png | Bin 0 -> 1343 bytes src/static/icons/home3.png | Bin 0 -> 2840 bytes src/static/icons/home4.png | Bin 0 -> 1896 bytes src/static/icons/home5.png | Bin 0 -> 2092 bytes src/static/icons/rural_ecommerce.png | Bin 1757 -> 0 bytes src/static/icons/village_service.png | Bin 1913 -> 0 bytes 13 files changed, 77 insertions(+), 52 deletions(-) delete mode 100644 src/static/icons/agriculture_course.png delete mode 100644 src/static/icons/agriculture_service.png create mode 100644 src/static/icons/home1.png create mode 100644 src/static/icons/home2.png create mode 100644 src/static/icons/home3.png create mode 100644 src/static/icons/home4.png create mode 100644 src/static/icons/home5.png delete mode 100644 src/static/icons/rural_ecommerce.png delete mode 100644 src/static/icons/village_service.png diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 80f70f0..84d3dac 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -51,44 +51,51 @@ - + - - + + {{ item.name }} @@ -248,7 +255,7 @@ - + @@ -297,26 +305,34 @@ - - - - - - - - - {{ item.title }} + + + + + + - {{ item.description }} - - 2025-8-23 - + - - + + @@ -337,8 +353,8 @@ - - + + @@ -432,14 +448,14 @@ export default defineComponent({ }, onChange(e) { - console.log(e) - this.city = this.swiperList[e.current].city - this.title = this.swiperList[e.current].title + // // console.log(e) + // this.city = this.swiperList[e.current].city + // this.title = this.swiperList[e.current].title }, changeTab(e) { - console.log(e) - // this.currentTab = e.id + // console.log(e) + this.current_item = e }, async getArticle() { diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue index 96357cb..bdc3e3d 100644 --- a/src/pages/my/components/wx-login.vue +++ b/src/pages/my/components/wx-login.vue @@ -172,12 +172,14 @@ import { defineComponent } from 'vue' // }) function more(item) { const islogin = hasLogin() + // const islogin = true if (islogin === false) { uni.navigateTo({ url: '/pages/login/login', }) return } + if (islogin === true) { // console.log(item) if (item.type == 1) { diff --git a/src/pages/my/setting.vue b/src/pages/my/setting.vue index 43fdc71..575cc60 100644 --- a/src/pages/my/setting.vue +++ b/src/pages/my/setting.vue @@ -15,7 +15,9 @@ :value="userInfo.nickname" :border="false" size="large" + is-link custom-style="padding:20rpx;font-size:28rpx" + @click="showName = true" /> - + Px*I!Q!9R9M5!nO}(9R~5%U=iEEL-PzqVyPLR4*v{0ST`-IG7RE2k{F&(qxw>uW zcW=~BnAs_(`UNdORRk5bW!AXNh?WKsj2!Hxy1Vt=W22*$o}vFbZ(~^qKNNV}DL4_F zf~ue`QEo)dwhC?#3-D-0h!CIxeDj`h|EsQ{FD%-mE#9eYkMe121-r^gFXQ;(Y$clIXpe1Mh?Zg{%M;Nw9UJ zF^yZ6M*D?n7-`l*ggh8|G@|hI)R;fh`0c9TcppxeMDNW!l)NzLV9*Ph69lLSs79zo z$Zh9<8#5&$2x*Z!O+oWcP~^w|`0w)6I_Q~7{VPs*rXhn&V8A6knR&c9ZEE@jGi5G6<$W4iNg?wszyWH-y}k>iDo~Qu8A(NuA}prhm4`3RhsS_d z1>oYmJ*>pvWlku$B#Qx;1Ye7=9N^MTxL#$~%mGuk!ANO+Dh)AdyB_R~yT<%OKCQ-h z(rGar0$$Uo>jCO9!CqTtS1kbVEWj7{(cHMC*lKk}GGCgRx5M7d^q&jy8&0M8GF_q2 zZv<{sA&>OMsu9X=%>o5f!5Ku0U-L8b^<$a3eVVdnbCkKQEV?{xv3)VKc3Y94Skigq z%f2K!C9*OiX~~mKO%>pMf$o@91QA1(qduBU`j%yzgr79l)Y}Ho3XEml0nODmPm|Um z4Vo1@q1hoXLb>^e;>)!=U8J+7_hxW>ygTUEXW>@9#r$1dDhzoQw6Pn}0A4fVMxD_% zdR2J!!`;>Nnxez`)*8`7h;61Q&_7LgqaELkrs4*g_5$~hv*DrO-;40U;`SEehNUST zphE{u4`=Y%p^g9lnE|+Rv(L~QWskWkymF<#D%m!4KQ@;w%cE1u6X0OEJD{seJ5$bf z2TkXcH!%QTpX}~oKmQlZ*FFWB{?9V}=wf%!dF*qfH_~)H?0)UhGqi1x@;(Xc3VO8E zzw9xn-9QVQo=K+nrebHex$hr?A-~zdSC&0!Wiy=744$2WnVYcCX7&GmHl~y)@Zf%7 zF$m}9lh23t3xBv_P2E4RPq?kL-p7$WaA2^jCQrqC;WDzOIoHO9Jlr?hF84;xeN+d8 z;gWFT_7XE68|UZJB6x7WV|o-$zneb4U4iGPU9(fwYkex%jMj7B0x@e=**zRa4SxDw z6^jwE$TLUWN{=pvbO8qjg^59^N25|T&R1;fsYTtJ`nfTg2Yb8geA8lopR2Q23lIZ$ z3>l-DHq%W5y5aO&pLZBWJsM{&=hR~Fyp|3DuNO~|SGF?tH$Gg(V!&JE$s>cSnu{yY z$;u8M7+3OONRN}+s7Io)ur$P34{$4TX2kJ5gMnV0JvlYZ+4q+?I$k1cDX0e>SV+LF z+I`|q$MJp2q2biU>aCD6oXX2bM5;}fAKVPz_afg>k^&8k*zT)|oi0_Q8Nuw^heq7#RbA7=O=Wz!OOK}p2zG(DLOl!gvIoF z_@}$XglByBi$kwy}HO(!Cp|2<7<0tJ9UVSSPkqY33{p%Y}e4OcD-u% zgutVSJ%Y(y2nR5R4C`sD5Tt6@|HOD7wKq}y?L@|JM5L?M{r>@2ga+AS6b0P?0000< KMNUMnLSTXh)Ib6N diff --git a/src/static/icons/agriculture_service.png b/src/static/icons/agriculture_service.png deleted file mode 100644 index e85c964d37cda2683207d8ba79c3c9671523edd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1718 zcmV;n21)seP)Px*a7jc#R9M5!SzC`3MHC)1#uw$qC^4GogV9GH`~{-$M11qbH%&A#B#Wp>3=l;V zL?U8hj8TX&-Vj*1MJ@`v$YtfS3(IZUof&p!uQRiKpP8P%On3G1oSL3t*|~LNH@eBU zv)j|>)K{mzI#qQlkqG%S0>T5MRq?r$E50)7i0_OsY2BD3ZU_fyZIVeVM;&>27Sty{ z1h^*=^$(!alq0>Ebj5Fzjv(OQkai`w$sxmd2;6J{eW0I|D|tyr8b~pzCk^?BBO#2D zc|PfggVaa{8=G)dm~u6k;V9O?N+D2$X_ugJKa=P$>nglM7z{h*2%E=1eDIFQra@ke zk==e1qcMR_si8b8!yMB=WEGGaF!=vM7Z5Mn4iz-AB^xI&0rcD(x|n7a0v-( zNVql83eUNJ8EH6H8RNKQPxA>?OK&xhf6{DV;(o+Q<0RRPtG?7AopH2fQ+}3E@MV%f zUBkBsH%IiMH4P_>6dbAC2!-?J1W%nor9vI`v&uk&G|J-pSuTrPQLbya+#mv=DtfK@XF8TVVz)nN)sl;x8d#9Kt z(?e=d_qAL_anvW>!Xe9GV+ZuBa1^7Ku1eftm<%ysX5k>(laHKR3M3O+lqj&1OzlZz zs_L_(HGyl*I;eHPeP+bYNJfBvosVN z4(iteNd);86R78P)PovnljrABi(E`P{;6~!HuT~scAJpCu3aQu+(4u${G@5h9>q3B zH1mHfUVtAW#?PfexNaAMl7_^TQzI?;D_I;%a}=oWNoG;XjYvxYmS4qRRHBB&M>!_a zv>1G?osJwNk=RJ%i2}YU<|J%Y`eH$Bq)*|p{i$-S z30qn`t78x5U)rV7WV?jRb-VXsBYhG{Z<7CL!skjqx208c{&U(x&$mB-t6nR6LTseZ zTT}3{e547V%xiQAH$(L73hIBM{Wi6~rTu4d%7gaHA4rEVw@#)Av1dy|8j_cPyZVE6B;E0F@Or(oA1Xp_e<5&S6>L&ADG=!*MJ(bUPyo zUPVnq`u-YeC_ggC3|sDUBHn;G_4UFpv0xAjKiy8_Sm4=mTP;su`sQvDq2ak==iq8J z4^;OX#k@U)<*zel25TUrSUnoWy~bsZUc?dq*=hX#oHfZy2iNe_P5PxtO(~T2=(AmF zAHFoqInbBfMp_0~j9=vC2#SYMS5bN49gMeHmU<;ee?f|<>KSF(SMZE}ERx>Wp|EbO zmi_Ad|KTu;7;lnAi|e;V0yEcBefYm5?%&O1RWP3jd|4!e`5GG8cbjUqPHMR%-XC2EQ$2G zne?SFYo+8G`!M=REZ&r{F(!w(Lu9D>5F)bw0Jq{Kc^=8DjsO4v M07*qoM6N<$f)A@dCjbBd diff --git a/src/static/icons/home1.png b/src/static/icons/home1.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc6bc06537e0d7132229c38b3d5546de11f5570 GIT binary patch literal 3056 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 diff --git a/src/static/icons/village_service.png b/src/static/icons/village_service.png deleted file mode 100644 index dd18350eed903765f2c4508799c4a799fa229950..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmV-<2Zs2GP)Px+Gf6~2R9M5!S?O<7RTLjIE+0(L#1Im`nD~MC!Nfno5MxvjgHbUeMhz-jAkbQ= zl%;GHno3Op0|kOaihu%%4Wf{OSO@{zGJUhJZT8KlWC zkGYR`-|zhH@1A?#xf)H8e*o|Zm*ieFO4{WniK{lsef7o^x1|{9liH1DMfasa?px#l z$6QS%{?5YLM=dGtb)&31fiLYhOM0*{7{JP4ECL4h96fJl(2W=+uG=W})f$q9`DGz& zQgpAHQXEGwu}da!NEYB_8@Oc$cqYMJFzgI2?1TDoVt;nY%mOk=x* zRX9zmIIvTCk)XK1uXrG!2oO|!5JJ$Ee)|Wn%Msv`8KLok@`hxpI{Bp71scT5dILI5>QCNT0|#mTJ0RF}EUvl2Fd;VEm%pmWMrjM{~2h)6055)w?0 zs4z5=W~5U?afoAk6qS#v!J-Mz7zB|Y9Vt>?PqmOA4kb()EU>Of*6ehy`NI0Lm9?1$_kq+nzcYq){%3~EAb>c;9 zfkQTTjg!V7$0%3Q>>Wr)##N>(vqS-et%*K3BeZ70BiYJAoOqGHNm!d=d!Fqj@JEDl zaai$VR){e#tM_C!=_WipyTYeDEpW=)GVL0~g`^xdp#_Q5b}H7j8f((<5+!t6(TE)7 zUUgVuX^pZ(KEgqKuHCZ_es(v{hzq_prdB!BrZkA8f79@iW%-yj$hSng7+Z9P&cRQv zJ+s0b?=6eBSqfBaMvY6dR8s^*nn=>hN5l)U1)nm(F@ASJ2x0$|pY_XbMxrnl_`1}{x;_hID*J`?T%g>fA(&y3)^pVa-p*>f8M#<6Y0B9&8AnOGnLWaIv%i1^ zB#Z%)dI#G8P3nq~wk0@dwrnUFC*3Vf?e8tsS?wL-iOP{~$Coyl z*TG&ysn>prR|u7xg?*VA^)u?KARuoG=^ z)Y%Asp~o!=EqHJgM44yHbf&g}r2zamcHv5Q$^Q$ISqa~AEAnEu@hjF(UeaF0UR&(q zQv4=fVELVLbRG8reABml9Cb+ch+`LU1GiYvc_*U6%Nk_9sua>hxvPSzZtnFPo4eNT}Vl%(dxCR>ZpU?Pz2wQO?Q_z%&virV+>2BgV!(eyL{j`vF zHM6gApX%<(NBW}J4plvGFs$iW0zcZe;b#5@n{44JUm#T8qSaG7a1+|luT?#Z$Dhq$ zG1O|`!%WUdawO z!k1vP?qgWp{aQ|(7ml*ImAn4o8o*l96PeO(-100&p%nAYRw}4Iay`_6OLi0dV6DSR zy92HS&f%8TkoRj`R6UJZwLHJ--c!l6cmH({uM~j5ye!g=sADc#B={iIE~Vyy7OtML z)EiXXuRKg@k9ir3qMcYfe>`W68ogaZ!|^Z>XQupz2+LQK}D`_{2$oa5<2$&nx;^&ZjsRh817ugRslknM+XhNnu4;-woZ5 zm3;U~rC{u2aY*+4JNY!K96?O(3$37HX|5@d2+S+%adQO37qEu?H7frno*CNl^ecfc z94_eWFzXyqRPY+c%+P~^9KvOL8H)2{p*;Qru?j6$R}xfO00000NkvXXu0mjfFut0X