From 107783062bc3d9cb8584b92afeb42c91bc9dcbd6 Mon Sep 17 00:00:00 2001 From: Waiting Date: Fri, 8 Mar 2024 18:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- deploy.ts | 1 + src/api/goods/index.ts | 14 + src/api/user/index.ts | 9 +- src/api/user/types.ts | 4 +- src/manifest.json | 6 +- src/pages.json | 13 +- src/pages/common/login/index.vue | 62 ++-- src/pages/mall/index.vue | 15 +- src/pages/mall/subs/goods/goods-detail.vue | 329 ++++++++++++++++++ src/pages/mall/subs/order/order-confirm.vue | 11 + src/pages/mine/index.vue | 2 +- .../mine/subs/order/components/order-item.vue | 132 +++++++ src/pages/mine/subs/order/order-list.vue | 4 + .../mine/subs/trade/components/trade-item.vue | 45 +++ src/pages/mine/subs/trade/index.vue | 11 - src/pages/mine/subs/trade/trade-list.vue | 52 +++ src/static/images/ic_arrow_right_gray.png | Bin 0 -> 1708 bytes src/static/images/ic_goods_order.png | Bin 0 -> 3036 bytes src/static/images/ic_goods_shoppingcart.png | Bin 0 -> 3752 bytes src/static/images/ic_goods_store.png | Bin 0 -> 3298 bytes src/static/images/ic_share.png | Bin 0 -> 2863 bytes src/static/images/ic_triangle_down.png | Bin 0 -> 1023 bytes src/store/modules/user/index.ts | 25 +- src/utils/request/interceptors.ts | 1 + 25 files changed, 675 insertions(+), 63 deletions(-) create mode 100644 src/api/goods/index.ts create mode 100644 src/pages/mall/subs/goods/goods-detail.vue create mode 100644 src/pages/mall/subs/order/order-confirm.vue create mode 100644 src/pages/mine/subs/trade/components/trade-item.vue delete mode 100644 src/pages/mine/subs/trade/index.vue create mode 100644 src/pages/mine/subs/trade/trade-list.vue create mode 100644 src/static/images/ic_arrow_right_gray.png create mode 100644 src/static/images/ic_goods_order.png create mode 100644 src/static/images/ic_goods_shoppingcart.png create mode 100644 src/static/images/ic_goods_store.png create mode 100644 src/static/images/ic_share.png create mode 100644 src/static/images/ic_triangle_down.png diff --git a/.env.development b/.env.development index fd86701..0434f5f 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE='uniapp-vue3-project' VITE_APP_ENV='development' # 接口地址 -VITE_APP_BASE_API='https://apidev.lakeapp.cn/' +VITE_APP_BASE_API='https://apidev.lakeapp.cn/ext/' # 删除console VITE_DROP_CONSOLE=false diff --git a/deploy.ts b/deploy.ts index 7e2794a..dc79cd0 100644 --- a/deploy.ts +++ b/deploy.ts @@ -14,6 +14,7 @@ const WX_DESC = envType == 'production' ? '正式环境' : '测试环境' (async () => { // @ts-ignore const manifest = path.resolve(__dirname, './src/manifest.json') + console.log(manifest) // @ts-ignore const manifestConfig = JSON.parse(fs.readFileSync(manifest).toString()) const appId = manifestConfig['mp-weixin'].appid diff --git a/src/api/goods/index.ts b/src/api/goods/index.ts new file mode 100644 index 0000000..da0beab --- /dev/null +++ b/src/api/goods/index.ts @@ -0,0 +1,14 @@ +import { get } from '@/utils'; + +enum URL { + CategoryList = '/goods/category_list', + GoodsList = '/goods/category_list', + GoodsDetail = '/goods/info', + Order = '/user/logout', +} + +export const getCategoryList = () => get({ url: URL.CategoryList }); + +export const getGoodsList = () => get({ url: URL.GoodsList }); + +export const getGoodsDetail = () => get({ url: URL.GoodsDetail }); diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 24eab72..f00e447 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -1,18 +1,19 @@ /** * 用户信息相关接口 */ -import type { LoginByCodeParams, LoginParams, LoginResult } from './types'; +import type { LoginParams, LoginResult } from './types'; import { get, post } from '@/utils/request'; import type { UserState } from '@/store/modules/user/types'; enum URL { - login = '/user/login', - loginByCode = '/user/loginByCode', + // login = '/member/login', + login = 'wechat/LoginByMa', + loginByCode = 'wechat/LoginByMaCode', logout = '/user/logout', profile = '/user/profile', } export const getUserProfile = () => get({ url: URL.profile }); export const login = (data: LoginParams) => post({ url: URL.login, data }); -export const loginByCode = (data: LoginByCodeParams) => post({ url: URL.loginByCode, data }); +export const loginByCode = (code: string, companyId: string) => post({ url: URL.loginByCode + `?code=${code}` }); export const logout = () => post({ url: URL.logout }); diff --git a/src/api/user/types.ts b/src/api/user/types.ts index 11a793f..1771c49 100644 --- a/src/api/user/types.ts +++ b/src/api/user/types.ts @@ -1,6 +1,8 @@ export interface LoginParams { - phone: string; + // phone: string; code: string; + userInfo: any; + referrerUserId: string; } export interface LoginByCodeParams { diff --git a/src/manifest.json b/src/manifest.json index 0714903..106b349 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,11 +1,10 @@ { - "name": "SUKE-MP", + "name": "SURE-MP", "appid": "", "description": "", "versionName": "1.0.0", "versionCode": "100", "transformPx": false, - /* 5+App特有相关 */ "app-plus": { "usingComponents": true, @@ -18,12 +17,11 @@ "autoclose": true, "delay": 0 }, - /* 模块配置 */ "modules": {} }, - /* 小程序特有相关 */ "mp-weixin": { +// "appid": "wx92e663dc11d0c0a8", "appid": "wx67a750d0ceed4d88", "setting": { diff --git a/src/pages.json b/src/pages.json index 196985e..bc8eb0c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -59,6 +59,17 @@ } ] }, + { + "root": "pages/mall/subs", + "pages": [ + { + "path": "goods/goods-detail", + "style": { + "navigationBarTitleText": "商品详情" + } + } + ] + }, { "root": "pages/mine/subs", "pages": [ @@ -93,7 +104,7 @@ } }, { - "path": "trade/index", + "path": "trade/trade-list", "style": { "navigationBarTitleText": "消费记录" } diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue index 328838f..12b40a9 100644 --- a/src/pages/common/login/index.vue +++ b/src/pages/common/login/index.vue @@ -1,47 +1,48 @@ - - diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue new file mode 100644 index 0000000..f45039f --- /dev/null +++ b/src/pages/mall/subs/order/order-confirm.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 240c42a..aa1e72d 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -94,7 +94,7 @@ const serviceList = [ { title: '消费记录', icon: assetsUrl('ic_member_service_record.png'), - path: '/pages/mine/subs/trade/index' + path: '/pages/mine/subs/trade/trade-list' }, { title: '关注公众号', diff --git a/src/pages/mine/subs/order/components/order-item.vue b/src/pages/mine/subs/order/components/order-item.vue index fc9cce8..039eec9 100644 --- a/src/pages/mine/subs/order/components/order-item.vue +++ b/src/pages/mine/subs/order/components/order-item.vue @@ -1,13 +1,145 @@ diff --git a/src/pages/mine/subs/order/order-list.vue b/src/pages/mine/subs/order/order-list.vue index b7c8965..7f98b21 100644 --- a/src/pages/mine/subs/order/order-list.vue +++ b/src/pages/mine/subs/order/order-list.vue @@ -1,9 +1,13 @@ diff --git a/src/pages/mine/subs/trade/index.vue b/src/pages/mine/subs/trade/index.vue deleted file mode 100644 index b242b35..0000000 --- a/src/pages/mine/subs/trade/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/pages/mine/subs/trade/trade-list.vue b/src/pages/mine/subs/trade/trade-list.vue new file mode 100644 index 0000000..326e2d9 --- /dev/null +++ b/src/pages/mine/subs/trade/trade-list.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/static/images/ic_arrow_right_gray.png b/src/static/images/ic_arrow_right_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa6236f360a0d844240d26c5f946b27df482ca9 GIT binary patch literal 1708 zcmV;d22=ToP)Px*W=TXrR9Hu~SZi!kWf*?m?{s!$UA0V51Y}&q3q}+PAfOQiK`!2@V9>~=bfaPZ z^8fz%j~^sRyQNt+L9js>7ts*e7-0-G8U=(U7|FoN#cqx%LeF}>*YlE7!ey*oSH7fa znsfR+=Y78Cectyy6pcnd1uzM~{mlG{*1B=cnl-=UE-Z>hqXz&y4B%b>jm*4@nfEKD zE`~y(o_t~o*a>DHLPRA1dWcBCHUsz$Kq8-j0`@U8&mp2Y0GOFO030QvhyaE{p)>i4 zjv|rBL?W66;57ix0w@OXw@|9J-s5(=_j|qG3xPnu94IKs231v6@Mo&8BH~43yGqVDWg|)7{-Y+_J1W%>0fMsa#4hvrrn%2c_4*WYyHv6q=@4 z%FOeLNGO$b@G^6!P)bC5tJcnSS06YLRGw(4BW0T9} zI#gO(nwT|fR;s^ecpF$W8XZJLBbfOWTa|ACc+uJPFGr;@rButRRjb+t43?%enM{sR zO3i2H*8xlvN=2na)F4q76cjY{SEaW_cH`4VqtV9zybPcmz*r)3Ypq!+wNq=o$uNxO z_V)IU%F4>DDD4xhuCA`=%9Sf4iD)h}zX{+4=V2}a_ys_%P#O#dPiI4EpJ1}Vx^?S3 zUaxnI)_S3%(x(6vr4wIN%FGSfs5B#3`iZNns~@*4Yc>(B0Wb!@Jz{UR>qz2%W-It$ zNl8gZAP}(b6lK<68#Zk48iw((Qfi(fn&$z?|1U`5+YeBuwLaWedCD3rO=(e4(KsSn z=m0(`*2c_TlJEfbq*AGdp+kqB>n-v71(v2K5{W#aloD$T11JSh;8YAbzfEqpyV2|Q zcHT;9PGGTEtk^WoQA(*-iD(fs&mbbwT3;Zdqn2fTZkMg*a5((ijpvsWSlYZVUApv$ zsMIM>6C9OxG4lZ@@%Q_DzU!3c40el`&bCwGBW4~=L@wvrS5om!)BLuxvr`gZ4;U;S zk9)hix<)bcJSW1L0F-Uy=fz8zc`JZJWo2cj1`L)~smJ3PtCSKS6{iuKlf>_`Yh#oB zd+X)Pm%qsiSenwRs;UVRp!_0dP!>CtE z{kU@F%6~*9IfDsxsZ?sRz3~bFi=C2ltqRzU(k1})e!ssZ5C~|e6y*k1U0p2=k+gbC zm|3VB?L7D~DWpQ3X__Z1Dk`K&y1x1qS(>_JGC7logt|p(>X^Bmi1sR_b||HONK=K}T6KSl>V&$hSFe6w zQBl#|SC^F$OsFd?ES$p3A2`%WJ1*2+WaceIv@@AZ9$ve4t=SuOS)Z9Ctk(Kzt@Tm> z&q<@|{P_fcCT9N9FpT5DU{KC1D*85x$ zGEtW?vKzeaeTO<34#n@}@Z+L7x7*#^*4Ac914ceOv%-F9X*H8l^KrYQr%y8xtNks)5zDf^X0 zGc#|~TK`;LUf$j>-fne}+S=NZWHLEfW@!iP0f)K{X5J^NbGzM5%a<>g7JEQTUb?&i zKnzvBeE_8I6Y6#m(GJ5fnu?2y|Lbcy$@U54rOOvYB;BlhWJ$~1LPXo_dF-cPF!)Ed zn`OFBB0I~>J|Yquk~cg1wAR}T3kw_bLETLPi9{kY>XZ_Z4CuRwNR-#)_xu0N2X(iC zEhVDCQr7LaJIC#0ZViXSXERZf%k_+|pUb9q`p^H@?EUEEk}C)R0000Px=mPtfGRCr$PTWf4w#TEX}+R{1Y`!2_aiWEprq4j4}do|Hda`= zbg92)%^JVj4Oq2mm9us0R_EZsgJ$vK#f8q!&O)_g9_{;S10|J8EmYN$MPzR-mmA)` zefvnY3s|ybNz(JY`Htf>xUM^#$z)xZPcZrBm)fYwNNdV8*`WRJhQ<|EZ=EP#L69Fs) z5Cd?UhXFyduMdT$B*%NHUs4-?wE|=T8 zWy_WWmCnWQDgvdWqhr>{$jBUH%v@{jLTl|=BGMF|^|>Ol9KZ(wBsqzy_5kRvLQqdc z763R8z`5Z#Z>s7J07C$>BC=0a|HZ$>VzFHS_7@6;(M%?jpX$67fs#(A&sEiS0G9(e zTSTZS+)V?(3Blo&%-`7#hCfr4uh?Hy)eSXfR`^FQb_@WGERQIE`1?)({i?dw_x;VA zHf?%ys*_F$l$9%2CPzm{sRb8`$VydR8Uj)jbgJ`DNB?~Q2*g$Z8+_k?*;>1GaBz?t z6RAZ8g@EL8xg`MZGR9nTm>P4pasWmFaQ8Uod;qiQyoFNi0q}MtiH_ch8W;z_BgC{P@jCrK2G?R2F6bcO@!ee@Ka5SzdE?7kVZmp$Vag8ywVbo&U zoZ`IH4%(T=d7S$D`!_|Ap)4q&QC+O6H;KrN02WgS0PmFyj z0)Y3lNmaky*Vp&0C;}a=Pjho~!WgsE7;}$^+!6NaRMqFKwVjURjH&8;Rb6b1;jKq- z_(MZaZQ7)&zwv$lnc!M~yPWYY3raej{(!ai)5e⁡0MwP@sPU$XIKCVvHF$+)r4( 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 N002ovPDHLkV1k`YRgeGx literal 0 HcmV?d00001 diff --git a/src/static/images/ic_triangle_down.png b/src/static/images/ic_triangle_down.png new file mode 100644 index 0000000000000000000000000000000000000000..9445a82a347ae6e5f1883ea79c916b28312bb60d GIT binary patch literal 1023 zcmVPx&xk*GpR7gw3mQid|RT#(r-#ND(rP&tH85l+qBSDizeG)a84iiV3bhQ<)4@5&_ z^x0S5mc99=F+xHK$sQmv6xL-OBU?}|28=N{Gh#HTQ7{1!!ZzAJ^-%)*Z@F3Vn7CP%NX+`fKQcDmqtcL<^&G$c)VLF z^$Ih8LPReD*!T$H1WZ)RG4nBI{w|---*z0QvIN)L+iP`pc5VhB3icDx>(xJ4C#tSB zBs1rU=pqqi%H?vdySw{lI-M3+EWyahIS}FBau~__Ta&ofR2yW?p zG#c%&ENi<`Dn&%Q06f12>WO7sXXa4=CxXG?Pnk?+{(cdbD|h!>UteE16bkha(Z>MZ zui49rb6ZeVF2HSO{@NIGG?&YbHCkiE4dsG_!{K(V^=_rqy8zy-SxgHo_l7X@jjBP& zaUKG2addR_dQ))q$+1{$o7Q?K5s3%(0C-{*bRK{OX1*Y{Q7)H<$H&KS0x&JXNsw*Z zn_SmT0gwvPa*1Q+5)u7vj5(Ok=Z{1pk%hs*!G>V>SV<##+qOfcQt4Tx)E**|BYqA* zs7VFIGOjZ7VIn#+H#hgQ<2a(E-vTp z7#L7fQ&StY))7fX>12o~{E#L=0A{Mq!~`>El~QMCXJ_w7&Ghk8OH+Kq)h>q)1Ogq! zVo~x>{O=_I9Sv%*c-bWYhqTt;4-XGt^$XRsa`gaFaC&0@2Kfmn>|x?(FI0N5*CG!YqQzGjRWk!Ngd?0hRwt5U8OOwnjG*w)q-Vdf+e?P2Cc zBD&yt-e-kE;aA6T9w_F`z&3RuR$4d~i){%8gD*4ld(3 { - if (result.code) { - const res = await loginByCode({ code: result.code }); + if(result.code) { + const res = await login({ + code: result.code, + userInfo: (await uni.getUserInfo()).userInfo, + referrerUserId: '1727303781559697409' + }); resolve(res); } else { reject(new Error(result.errMsg)); @@ -72,11 +75,11 @@ const useUserStore = defineStore('user', { fail: (err: any) => { console.error(`login error: ${err}`); reject(err); - }, + } }); }); - }, - }, + } + } }); export default useUserStore; diff --git a/src/utils/request/interceptors.ts b/src/utils/request/interceptors.ts index 7d1f105..79c6f53 100644 --- a/src/utils/request/interceptors.ts +++ b/src/utils/request/interceptors.ts @@ -26,6 +26,7 @@ function requestInterceptors() { const token = getToken(); if(token && config.header) { config.header.token = token; + config.header.Authorization = token; } return config; },