From 168d049b047dee2c19b9df9c34dc7ec3e3b4ef13 Mon Sep 17 00:00:00 2001 From: chenhao Date: Tue, 30 Jun 2026 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=20appid=20=E6=8A=BD=E5=88=B0?= =?UTF-8?q?=20.env=E3=80=81=E5=90=88=E5=B9=B6=20env=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=81My=20=E9=A1=B5=E5=BA=95=E9=83=A8=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=9B=BE=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- .env | 3 +++ .env.development | 2 -- .env.production | 2 -- public/img/icon-trade-detail-state-1.png | Bin 0 -> 1189 bytes public/img/icon-trade-detail-state-2.png | Bin 0 -> 3715 bytes public/img/icon-trade-detail-state-3.png | Bin 0 -> 1389 bytes public/img/icon-trade-detail-state-4.png | Bin 0 -> 1469 bytes public/img/icon-trade-detail-state-5.png | Bin 0 -> 1357 bytes public/img/icon-trade-detail-state-6.png | Bin 0 -> 2122 bytes src/App.vue | 14 +++++++------- src/styles/ch.less | 4 +--- src/styles/public.less | 1 + src/views/Account/Login.vue | 2 +- src/views/Goods/GoodsDetail.vue | 11 ++++++----- src/views/Trade/TradeConfirm.vue | 8 ++++---- src/views/Trade/TradeList.vue | 14 ++++++++------ src/views/User/Invite.vue | 6 +++++- src/views/User/My.vue | 7 +++++++ 18 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 .env delete mode 100644 .env.development delete mode 100644 .env.production create mode 100644 public/img/icon-trade-detail-state-1.png create mode 100644 public/img/icon-trade-detail-state-2.png create mode 100644 public/img/icon-trade-detail-state-3.png create mode 100644 public/img/icon-trade-detail-state-4.png create mode 100644 public/img/icon-trade-detail-state-5.png create mode 100644 public/img/icon-trade-detail-state-6.png diff --git a/.env b/.env new file mode 100644 index 0000000..2f3ac11 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +VITE_API_URL = "https://shop.jhxinyu.com" +VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" +VITE_WX_APPID = "wx7f6c37c381b4f273" diff --git a/.env.development b/.env.development deleted file mode 100644 index f465bc7..0000000 --- a/.env.development +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL = "https://shop.jhxinyu.com" -VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/.env.production b/.env.production deleted file mode 100644 index f465bc7..0000000 --- a/.env.production +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL = "https://shop.jhxinyu.com" -VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/public/img/icon-trade-detail-state-1.png b/public/img/icon-trade-detail-state-1.png new file mode 100644 index 0000000000000000000000000000000000000000..573bc884363589ae5f4a71c1c2531e4940f8dd99 GIT binary patch literal 1189 zcmV;W1X}xvP)PM@Bjz`p8!5U0p0-#;BVj$U=w%+#9WNQF>SyP zz#Bju+M8@1_o^H_01tsVAZ;;NE0)gY`LG%S0>Do|#zg`7mdTb8sFa9rfYS;J$hXsM znXXX>{8&W+`8Ju2;l20}cyWUwbbFDF#StF>uWLYrZm+X3*`f}3Sp&i6+b`JcW;Zz| z%Gsn<5l?C$*m5>fPDBgUonoEZX*Sl9%+x@TR&B-@xMKMGbF_t=@mT@G!^4b@juHxm z5Rsy34h{|w5!%|?NT<^PsH)2G@i7+{7qqsvqA33@Mo|#yuL57XAC5U@Et|t&*U8CA*pqRG@g(xWvT71aot9G&MDGeSKZ2V%~XyI1aj(6?S)b z>FChrlEJ}2lF20Cc#1XSR0a0j&Q&KE3^Fw}#rXI*KA(^F_V)5l&Ug#(42ui2{r!DQ zi^lc!b=lh5l5jYjd)C|AE1R2}A|m4TdQ18)EiKtyGz##{i}o?)Dt&!@1?#enjSa%# zFpZ6kq*5uji~LOmesw$7Qj5!UI?eI%vD?J~yi(E5Cw8o)uD~EIz`>&NFW{~IJ2GRI zQpdp(yBhp#{3nQoPu=b9Z4nU}7#OfS7%ki3;h~+up8M1__LX_yD>LaMBO}bt&H}Kr zW2raVA`l4R_xo8}Tcf|f--^ou@OA#fFR*Zc6NyCR=;+ART@xcKD=X67-EE~cGH6>^ zMfu-u(B*S$woF0WAin89%URh?Y@Nv(2)2|xw<-c^_n_w`4$c#A#nGG2tvC$TsYC0R zHzndZE*wuAxrqw{-?}NlNC23k@>e*fsNfY2BRy2^QcX`a1mvS%bNbyvprvdF7p^(E z`K8o`cJZtiZ9h4PcJWM~ZHyPs{scDAE}s44M&bVgEg{l=gP7BF00000NkvXXu0mjf Dl|nCo literal 0 HcmV?d00001 diff --git a/public/img/icon-trade-detail-state-2.png b/public/img/icon-trade-detail-state-2.png new file mode 100644 index 0000000000000000000000000000000000000000..36c0e6b5ee769e0cabb6b2d49b938fd8b6bb99b7 GIT binary patch literal 3715 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 literal 0 HcmV?d00001 diff --git a/public/img/icon-trade-detail-state-3.png b/public/img/icon-trade-detail-state-3.png new file mode 100644 index 0000000000000000000000000000000000000000..7e555c693b54a1b8ca94904773900c2e2b49f08e GIT binary patch literal 1389 zcmV-z1(N!SP)h>PCZGqH2E-+&b8T!cvvvULfFad2-nlO1gr^OX2fvFW>!sJv=lOu$HJ1anZ zK7YpHYqp%K5j~+d8(}aaL zZ{G0m;X@}?{6MF90nkyBg5||QFpO*jKJlVOpU+ov8-Bmz7vm#fiy!#Bcy$B$-Txj*bpSMn)EuS63VJxV39-H|Z7LcO2^y zi3Af96Ynh3Gz|dbhL#sWAccdc5(osW@uIV{lfJ$_(&;n+p^&k7({o>2z8|L{6MIQLv4g zni}i>VzHP^OiV~Nn-xvdWarMEa`Wa*H%7JuG0rDua4-WF5q9t1O>J#0Gcz+ZH#d_? zrP#M`AGdDZ;>eLBBoYa-+3ccvt*xynio%T>H#l(M0Gg)J)z!t7D_7|5?k15)*p*@8 z58zMp$2WGIpF4L>E?&GSfj~gIySqh1WPE(wDpwRmbX~W#KJV%2vFfc`w@ySv9z1v; zkw`=i9XjOXX?zF9I0D9w#J3b#C7wNd*1DdZodsamu3c=~wvBi^&e5Ys@%el_e*Boh z!NEo2iHOkL+)P_r8*OcET)K1#RaH5C`ZNHsSPWHF>F@8i`!samhx|W|Ik*c_QBfiH z?%fj+k!&_AuU@^f?sj{7d%=3)aM)UxXEGU4RaHbpQmK^G)zvxuHpbrNt`UdZK@}Ah zGB7Y8$z)P=U64jL1 zgn=)-G_VjGfU7Kh3ddEJFok0w>RGy^n)-4W$cLHc^qUQ#g*bx;X-=h|1N?_g7>Q?} vVQlr+U?iTI(Pm-d*;C*bjKs6Qz3BX3cwS;0eAdum00000NkvXXu0mjf$>@s$ literal 0 HcmV?d00001 diff --git a/public/img/icon-trade-detail-state-4.png b/public/img/icon-trade-detail-state-4.png new file mode 100644 index 0000000000000000000000000000000000000000..088125dccfe4b750c89af84e2bc135ebab37ff66 GIT binary patch literal 1469 zcmV;u1w#6XP);6Dh@Q){Kek z_Tt{VcJAME&b{0GyxRSp=lMO~@1Aow=lMNPPAC*28;Ho`z>B~Oz_Y-Uz+*sOq{-jF z5HJAr0bRf^s`^JZ#?Q&bh=>#dtAV$HSAdx|Q;Y&X0jGd(RrOD&S{xY>k>`P0;2q#m zr-R3E4`>38s%nqj&bEw*$ZX&<;C;IT+2jbYUseCH+QG6B5qS;x1`uc3Y@@(VRSj5a z?6T5GMCyPJrp^SBvA!3PgH{@+oe>fF8rYEqVVQ73RX3$-kkW{Vv;yn1t;!)Cs`^H< zi%D;-$V@yeCIDU+kz>g&CNvUxCZ_v#O2ifsIgsc=+^r=d6+rh?sLFtsRrTkIfkZR% z-4uz*ggA{RBO+1{luVf%=j4mX7ZU^Hx0Z+)!0>da%77?c29o>FN=YSuUUo`zyPw zQdLz&b8~ZCyr;*~`f4Un*-f|5#sB4+DWkl+oU>=o z#>Ly(+St2yualH{E?|z;)}^JT?Ao=9B}wr<^Od87pk7SP__PF|k*PCkGBJUez|yoMWb8-`H>Je{uP*w`4=)zzlh z%9Sg*bLS3SU0o^r78Dc^3SO3JVKO@rxHPQd3joSa}RTxDCU221r_+m`GPwS5h-WLql|S zcADbz=FKAz2vAg1WQt$9bcuEA)@3H$OpDtvj2vtf8j_h=v0??o!^7id48tH02q0pv z>0Q2jnKf(HWUM@fPu+%L+yM4q<9jQWng0HM1_lNQ27?qA7n`nkcX#9S`LZE=B6orJ zq6;fWg}80owsG)ad`0utty>fn6qsT?Jw156UdG18oC;1xo2phv7gk9NU#VzpY~;X! z_!V-jiQe8`d_Lb~n1G1(s1ZNmDY8v6Gf}Qwxq{d0<-vmoPSU62E@ACqBdQt#8k}ZJ zX6D+pYxsOVMn^}TrcTGs#U8P8F8F49sdHKM}L?~rXsQh zhtErtii!$KN=oqi{h6e(!X8!qGWsJ??e|xvdDUovtEy^R5GJbquAU+>neb+8AkK)Y z-T<=p5i|*GRMr02V8Z^n5)21!iQ=spFxR|(J?0g5qXR7 zTIN;YDVyDY2Yw{HrfAPZN5)1bA|jPQCE-~rBYf~IdJO6w;e%(t5&rLYs%mF^7H9ki XDLm9+p_!8&00000NkvXXu0mjfhhMz2 literal 0 HcmV?d00001 diff --git a/public/img/icon-trade-detail-state-5.png b/public/img/icon-trade-detail-state-5.png new file mode 100644 index 0000000000000000000000000000000000000000..972950d9293078544ed77adeebf6cb56f5edc535 GIT binary patch literal 1357 zcmV-T1+w~yP)*r*1|pz^A~sK$L+7yor)IcS{X^Q8N+&)B?}Wfp8^Cq=pE8LH>+{ z13v&c28auk9H}K-={zMP7WpsSvj9xE5n2u_bu%R+Wxxi*r3KEtz%E~B`7-j@Jl_*) zl*j>i8r}oqGT@BT)5&BBVM#$T;aPVZs&sN_kb#=Lj5htM6fy{`0xnXDO#rr$yD2d{JO=s`mb zn3pWYy6Y<})&x!`->ekoloQlOyo`Jg49nsWooz`O6T|zHmAmIBgSZVM22v9!8$fGF@>xCJm768+%VT1gT0A0Z)qq zv;3mae>|>#M_lgMSKl*4xHsloZ^LPKXbBa=#T#b1vdd75o*Ey=5}!!)GcV|^S&_+q zhqQ#P0FumFNAQ~>A{nXwnaev~F+{XCVHvB5+fk-9JliZEVd?}0;keqz_}S*U@PTu5 zM9V$mCNoH08cmo&!;I8E4Rdr1IGtL<(}a;^gEh?sNy5m|`N|%4XO><~MF}H*hfbqN z_@bJWgFg|OeV-l~BF!3tbVc<2#II`!P0e8VL>=Sj&*;*;xFVV!)><(IE7u9aGuM*- z%Q=^c{_>A$-v}aft>DSAIWqCX+o4T-;eR;!gi|@}Rxuy=2IhgM4rSyLIre0|U z1HwqFUadJNr(BDGs7;R&wfX-=T+DMX6aUE`*YU;8>-lG2gLF z$Rzb>J=UF{#8E_yB)*fKu zQX6BEZ|S7&~ojmkC-F$+FkpR|^xD z>uvW3%>}x!RclB&d_pIw+PHS)J333ZDa9%l=uj(}hNPr(Oa7At$Hp0IU}}7fk%p5D zRPRv=Q7xGw3&h_TDO3lx$~VE+@wF%x0iP{k6Xo6}@Kcm~(TEXW2ZW|lU(F~PvB`4e zsRd->l+M4g~PZanLpb!Ol{%Ry84rqumB P00000NkvXXu0mjf44{OW literal 0 HcmV?d00001 diff --git a/public/img/icon-trade-detail-state-6.png b/public/img/icon-trade-detail-state-6.png new file mode 100644 index 0000000000000000000000000000000000000000..d23b2d70336f6192749a958a902887abe8a7feec GIT binary patch literal 2122 zcmV-Q2(|Z#P)KvwKWL({N*r$SC7KX}g2q>L#IUvK6NwKgY?y_YNF-sxK%w{`(@jx>L1%3h zC}{WL(8|l9J)qJ3lk=hHzOHlsdiOr}ecjhpnOd#p6BP->0|p=*mv+Z z{=vs}_-o4!!~m@WZw>`l0k?r~$I^pBp&%k6g1K|&5*#edus3hs(AL&QOG^vy-@hLd zIq*+lDbVe?F?227&lsRrtXM%>S{jLoiHx*LIUEkk%E~AxD4?REVzga+3;Z5o4*>>` z_*|d~khHJ^%%4A>?Cfk}Vq(1aoK7b#EiJrw@dAM9)29<29zN&`)z;RsXU`rQ8yiOh z-vj)N{!MBixEWzbl%$T-9T_1@Drf$=P8rPIDY&%>FMbJl$4ZUGMRY#^r@ttH5v`s z+1adJyB2`FygW=M6K=O#iu(sZ5B$rs({Se$LVyka^*@41_Lsgj9a&ENpY6}UBKTx;Fp0({=DMj<2iHY3;-sRiF4=9Nd_LO z+S*z=J3C2COe8iomfG4{9zA*_#dQ{tBL|{@Z~R%SR4VU$%+Jr~;>C-D+SAk1si>$R zDk^H2Z&Xwi6%`e1-@bj&{k*(9^7Hcn$j!|qC@4rOc$6GiA;mg1HI>=3XVcNq!GQw@ zhP5wUx)g)KfYoXp1RowAj@4?#U@)*`$&z7ynVFe9fBu|Vvu2T+nkoea;5#|6P>QAJ zWz5OR5uMW}lL?#6Mrdd#MMXtuwOX`VEjMo5AT%@-o6UyFWE$q@bUHb8>eQe=_`eA~u_i0I{*L{%`|0Y=>EWHK3HVPQl^N2AebIC$`&x9!N0BWN@lqNAe; z3kyRglZif~p`if~-U$g(E0GXyPn$LkfcExw(e}N2_lmx-02Yg7(C4E^kCK&@HO$WQ zY)@Z)6fEh$t5T@|=<4bcZEtI9Sy|o}OQHA}@|2a8d4sO%>S{7FGDQ6g3kwMf3Zl5USQ5CT@ ztJOPz)BY^4T)9F@N(yGPd05ObR0HSu%$YNN&T+L`O>uEC27`gd#zvMcTP6j3ryP)U zj>^r=1z_XGjedXbuC6Y+ySwS`?jCU^0tgBU!eX&tFc`4g?S2PjfGXrbGw|4-Wqo}; zSFc`0E|+uZ(xnm4mH;l7i-d#(5)u+{xm=<)0RaIN6ci8_7l+g7Bqb$<=H_N8(2oI| zC$D1hW$95yMh5Ne?dbJ-EEbE;FjS+_P*zsPjvYIOwJ8(|E?>UP>eZ|1>gvL1G;-(8 z9VrMNR<{Q{58+tkQ?FjV!e}(&a5#vIi{s|ao6MOrN7Q!W#EFa_Kb~X9jXIZyy9lgE1q@|@%RaGSw`a?gfH(UE(grxk>{dsnDbWl}QMN(1{I-QO!TecvV z%ei;&9z8uhUOSu3Mo35qixw?n&6+hdH8s)N+RBL&C)m7sGao*DVC&Ycl$4Z6g$B6l z0UvXEV#bUaT)1$7xH#dc`tIF3N=r+rtgNJ|sfp(1W?U{8=g*(VXf)E((?extC5efN z0BqZ~ZCD)RM?DAwE5r{u zY3ZQ0-Me>7?qk4pWFV_p3a*ARq?J8WV)5d|=yW=)R;%~Kqf{zczkWSht(Nlg^3lAA z9yK6rlHL@YSkhAu)bf9x^b|`ow*tQg#24T%D;EMw>(GXg^5f;e_k3M=S3g6!Sfj6s z#1Ftagn0c+%K@zKXAqUY8qnVm(iaV%4avV65Q@Ej^<^ZbT=)vO0=R)Ce7^eTP`Q9( zz!uqw|^!l#$SzX!yF75{pKP@MWAC2=uD z0pIcQPYB-t6Zm+JeFMA&{=>&VAygoQ(__~E0GcJ*1)X*LiU0rr07*qoM6N<$g2nXh AqyPW_ literal 0 HcmV?d00001 diff --git a/src/App.vue b/src/App.vue index c0d44bb..211ad15 100644 --- a/src/App.vue +++ b/src/App.vue @@ -111,13 +111,13 @@ export default { wx.ready(() => { wx.updateAppMessageShareData(shareinfo); wx.updateTimelineShareData(shareinfo); - wx.getLocation({ - type: 'gcj02', - success: (e) => { - localStorage.setItem('user_latitude', e.latitude) - localStorage.setItem('user_longitude', e.longitude) - } - }); + // wx.getLocation({ + // type: 'gcj02', + // success: (e) => { + // localStorage.setItem('user_latitude', e.latitude) + // localStorage.setItem('user_longitude', e.longitude) + // } + // }); }); wx.error((e) => { }); diff --git a/src/styles/ch.less b/src/styles/ch.less index 5421897..69bf742 100644 --- a/src/styles/ch.less +++ b/src/styles/ch.less @@ -1,8 +1,6 @@ @import 'public.less'; @import 'tailwind.less'; -@proColor: #841e36; - :root:root { --main-color: #2e5d31; } @@ -1062,7 +1060,7 @@ .box; .box-center-center; padding: 0 2.4vw; - background: @proColor; + background: var(--main-color); width: 13.33vw; height: 6vw; border-radius: 3vw; diff --git a/src/styles/public.less b/src/styles/public.less index 090c68c..72595ef 100644 --- a/src/styles/public.less +++ b/src/styles/public.less @@ -667,6 +667,7 @@ img { .trade_confirm__deduction { .trade_confirm__deduction_top { .box; + padding-bottom: 3.33vw; span { font-weight: bold; diff --git a/src/views/Account/Login.vue b/src/views/Account/Login.vue index 965d0a0..6859b84 100644 --- a/src/views/Account/Login.vue +++ b/src/views/Account/Login.vue @@ -176,7 +176,7 @@ export default { checkWxLogin() { if (!this.$isWechat()) return const REDIRECT_URI = encodeURIComponent('https://shop.jhxinyu.com/#/WxCallback') - window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxdff8dd2032f1e054&redirect_uri=${REDIRECT_URI}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` + window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${import.meta.env.VITE_WX_APPID}&redirect_uri=${REDIRECT_URI}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` }, validatePhone(phone) { if (!phone) { diff --git a/src/views/Goods/GoodsDetail.vue b/src/views/Goods/GoodsDetail.vue index 50e50fe..1666b0b 100644 --- a/src/views/Goods/GoodsDetail.vue +++ b/src/views/Goods/GoodsDetail.vue @@ -31,7 +31,7 @@ -
+
@@ -153,7 +153,8 @@ {{ data.saleprice?.toFixed(2) || '0.00' }}积分
- +