From d1b1ff58f3e1012856f9fe2700068f00fdb41989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Thu, 17 Apr 2025 18:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=A1=B5=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB=E6=A1=86=E4=BB=A5=E5=8F=8A=E8=8B=A5?= =?UTF-8?q?=E5=B9=B2=E6=93=8D=E4=BD=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.js | 3 +- app.json | 19 +-- app.wxss | 5 +- assets/icon.wxss | 12 +- assets/tabbar/_tab1-active.png | Bin 0 -> 1205 bytes assets/tabbar/_tab1.png | Bin 0 -> 1132 bytes assets/tabbar/_tab2-active.png | Bin 0 -> 2252 bytes assets/tabbar/_tab2.png | Bin 0 -> 2195 bytes assets/tabbar/_tab3-active.png | Bin 0 -> 1876 bytes assets/tabbar/_tab3.png | Bin 0 -> 1844 bytes assets/tabbar/tab1-active.png | Bin 1205 -> 1629 bytes assets/tabbar/tab1.png | Bin 1132 -> 1724 bytes assets/tabbar/tab2-active.png | Bin 2252 -> 2099 bytes assets/tabbar/tab2.png | Bin 2195 -> 2185 bytes assets/tabbar/tab3-active.png | Bin 1876 -> 1724 bytes assets/tabbar/tab3.png | Bin 1844 -> 1763 bytes component/share-modal-view/index.js | 60 +++++++++ component/share-modal-view/index.json | 7 ++ component/share-modal-view/index.wxml | 24 ++++ component/share-modal-view/index.wxss | 124 ++++++++++++++++++ pages/closet/index/index.js | 11 +- pages/closet/index/index.wxml | 8 +- pages/closet/index/index.wxss | 19 ++- pages/my/history/list.js | 173 ++++++++++++++++++++++++++ pages/my/history/list.json | 7 ++ pages/my/history/list.wxml | 27 ++++ pages/my/history/list.wxss | 65 ++++++++++ pages/my/images/index.js | 45 ++++++- pages/my/images/index.wxml | 12 ++ pages/my/images/index.wxss | 24 ++++ pages/my/index/index.wxml | 11 +- pages/my/index/index.wxss | 11 +- pages/my/setting/index.json | 2 +- pages/my/setting/index.wxml | 6 +- pages/try/index/index.js | 80 ++++++++++-- pages/try/index/index.json | 3 +- pages/try/index/index.wxml | 122 +++++++++++------- pages/try/index/index.wxss | 84 +++++++++++-- project.private.config.json | 6 +- 39 files changed, 863 insertions(+), 107 deletions(-) create mode 100644 assets/tabbar/_tab1-active.png create mode 100644 assets/tabbar/_tab1.png create mode 100644 assets/tabbar/_tab2-active.png create mode 100644 assets/tabbar/_tab2.png create mode 100644 assets/tabbar/_tab3-active.png create mode 100644 assets/tabbar/_tab3.png create mode 100644 component/share-modal-view/index.js create mode 100644 component/share-modal-view/index.json create mode 100644 component/share-modal-view/index.wxml create mode 100644 component/share-modal-view/index.wxss create mode 100644 pages/my/history/list.js create mode 100644 pages/my/history/list.json create mode 100644 pages/my/history/list.wxml create mode 100644 pages/my/history/list.wxss diff --git a/api/request.js b/api/request.js index 5e20ad3..d6523a3 100644 --- a/api/request.js +++ b/api/request.js @@ -50,6 +50,7 @@ class Request { return response; } } + console.log(response); throw new Error(response.data) }); } @@ -93,7 +94,7 @@ class Request { if(!config.ignoreError){ wx.showToast({ icon:'error', - title: response.data.message||'未知错误', + title: res.data.message||'未知错误', }) } reject(error); diff --git a/app.json b/app.json index e2a918d..58d37bd 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,8 @@ "pages/closet/index/index", "pages/my/index/index", "pages/my/setting/index", - "pages/my/setting/name/index" + "pages/my/setting/name/index", + "pages/my/history/list" ], "window": { "navigationBarTextStyle": "black", @@ -14,20 +15,22 @@ "navigationBarBackgroundColor": "#ffffff" }, "tabBar": { - "selectedColor": "#FF2727", + "color": "#999", + "selectedColor": "#000000", + "borderStyle": "black", "list": [ - { - "pagePath": "pages/closet/index/index", - "text": "衣橱", - "iconPath": "/assets/tabbar/tab1.png", - "selectedIconPath": "/assets/tabbar/tab1-active.png" - }, { "pagePath": "pages/try/index/index", "text": "试衣间", "iconPath": "/assets/tabbar/tab2.png", "selectedIconPath": "/assets/tabbar/tab2-active.png" }, + { + "pagePath": "pages/closet/index/index", + "text": "衣橱", + "iconPath": "/assets/tabbar/tab1.png", + "selectedIconPath": "/assets/tabbar/tab1-active.png" + }, { "pagePath": "pages/my/index/index", "text": "我的", diff --git a/app.wxss b/app.wxss index b9c731a..a6e133e 100644 --- a/app.wxss +++ b/app.wxss @@ -1,6 +1,7 @@ @import './assets/icon.wxss'; page{ - --main-color:#FF2727; + /* --main-color:#FF2727; */ + --main-color:#000; --main-bgclolor:#ffffff; --main-font-color:#333; --safe-bottom:constant(safe-area-inset-bottom); @@ -26,7 +27,7 @@ button{ border-radius: 80rpx; background-color: #000; color: #fff; - transition-duration: .4s; + /* transition-duration: .4s; */ margin:0; } wx-button:not([size=mini]){ diff --git a/assets/icon.wxss b/assets/icon.wxss index 9e6b6c6..8ea9fd1 100644 --- a/assets/icon.wxss +++ b/assets/icon.wxss @@ -55,6 +55,14 @@ mask-image: var(--icon-history); -webkit-mask-image: var(--icon-history); } +.icon.more{ + mask-image: var(--icon-more); + -webkit-mask-image: var(--icon-more); +} +.icon.lajitong{ + mask-image: var(--icon-lajitong); + -webkit-mask-image: var(--icon-lajitong); +} .icon.warn{ position: relative; background-color: #fff; @@ -86,5 +94,7 @@ page{ --icon-warn:url(data:image/svg+xml,%3Csvg%20t%3D%221744472102058%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2255997%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M512%200C229.205333%200%200%20229.205333%200%20512s229.205333%20512%20512%20512%20512-229.205333%20512-512S794.794667%200%20512%200z%20m0%20796.458667A56.917333%2056.917333%200%201%201%20511.957333%20682.666667%2056.917333%2056.917333%200%200%201%20512%20796.458667z%20m54.186667-227.797334h0.128a60.501333%2060.501333%200%200%201-53.802667%2055.893334c2.048%200.256%203.882667%201.152%205.973333%201.152h-11.818666c2.048%200%203.84-0.981333%205.845333-1.109334a59.093333%2059.093333%200%200%201-53.162667-55.893333l-13.056-284.16a54.314667%2054.314667%200%200%201%2054.613334-57.045333h26.282666a52.992%2052.992%200%200%201%2054.186667%2057.002666l-15.146667%20284.16z%22%20fill%3D%22%23B94343%22%20p-id%3D%2255998%22%3E%3C/path%3E%3C/svg%3E); --icon-delete:url(data:image/svg+xml,%3Csvg%20t%3D%221744473381401%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2258654%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M512%200C228.864%200%200%20228.864%200%20512%200%20795.136%20228.864%201024%20512%201024%20795.136%201024%201024%20795.136%201024%20512%201024%20228.864%20795.136%200%20512%200ZM768%20695.808%20695.808%20768%20512%20584.192%20328.192%20768%20256%20695.808%20439.808%20512%20256%20328.192%20328.192%20256%20512%20439.808%20695.808%20256%20768%20328.192%20584.192%20512%20768%20695.808Z%22%20fill%3D%22%23000000%22%20p-id%3D%2258655%22%20data-spm-anchor-id%3D%22a313x.search_index.0.i52.389b3a81KbR0ru%22%3E%3C/path%3E%3C/svg%3E); --icon-history:url(data:image/svg+xml,%3Csvg%20t%3D%221744605585155%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2259650%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M512.00768%2015.15008a496.19456%20496.19456%200%200%201%20351.38944%20145.63328l1.92896%202.176a496.768%20496.768%200%200%201-1.92896%20700.52864l-2.15424%201.60256a496.77952%20496.77952%200%200%201-700.65024-1.60256%20496.78976%20496.78976%200%200%201%200-702.43456v-0.2752h0.2752A494.51904%20494.51904%200%200%201%20512.00768%2015.15008z%20m217.07008%20458.60224H550.27712V169.71904a38.40768%2038.40768%200%201%200-76.81536%200v342.25664a38.85824%2038.85824%200%200%200%2038.54592%2038.528h217.07008c20.88832%200%2037.99424-17.34656%2037.99424-38.528a38.15936%2038.15936%200%200%200-37.99424-38.22336z%20m80.04608-259.0016a419.48288%20419.48288%200%200%200-297.11616-123.136c-116.43776%200-221.42848%2046.63296-297.69216%20123.136a421.504%20421.504%200%200%200%200%20594.47424%20420.77568%20420.77568%200%200%200%20593.20448%201.62688l1.60384-1.62688c76.0128-75.92064%20123.7504-181.15328%20123.7504-297.24928a419.904%20419.904%200%200%200-121.57184-295.59808l-2.176-1.62688z%22%20fill%3D%22%233B3F51%22%20p-id%3D%2259651%22%3E%3C/path%3E%3C/svg%3E); - --icon-close:url(data:image/svg+xml,%3Csvg%20t%3D%221744706202919%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2260727%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M942.506667%200L512%20430.506667%2081.493333%200%200%2081.493333%20430.506667%20512%200%20942.506667%2081.493333%201024%20512%20593.493333%20942.506667%201024%201024%20942.506667%20593.493333%20512%201024%2081.493333%20942.506667%200z%22%20fill%3D%22%23000000%22%20p-id%3D%2260728%22%3E%3C/path%3E%3C/svg%3E) + --icon-close:url(data:image/svg+xml,%3Csvg%20t%3D%221744706202919%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2260727%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M942.506667%200L512%20430.506667%2081.493333%200%200%2081.493333%20430.506667%20512%200%20942.506667%2081.493333%201024%20512%20593.493333%20942.506667%201024%201024%20942.506667%20593.493333%20512%201024%2081.493333%20942.506667%200z%22%20fill%3D%22%23000000%22%20p-id%3D%2260728%22%3E%3C/path%3E%3C/svg%3E); + --icon-more:url(data:image/svg+xml,%3Csvg%20t%3D%221744806307165%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2267903%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M227.14123%20413.647995c-52.14973%200-94.587262%2042.439578-94.587262%2094.587262%200%2052.14973%2042.437531%2094.587262%2094.587262%2094.587262%2052.147684%200%2094.587262-42.437531%2094.587262-94.587262C321.728492%20456.087573%20279.288914%20413.647995%20227.14123%20413.647995z%22%20fill%3D%22%23272636%22%20p-id%3D%2267904%22%3E%3C/path%3E%3Cpath%20d%3D%22M510.903016%20413.647995c-52.14973%200-94.587262%2042.439578-94.587262%2094.587262%200%2052.14973%2042.437531%2094.587262%2094.587262%2094.587262%2052.147684%200%2094.587262-42.437531%2094.587262-94.587262C605.490278%20456.087573%20563.051723%20413.647995%20510.903016%20413.647995z%22%20fill%3D%22%23272636%22%20p-id%3D%2267905%22%3E%3C/path%3E%3Cpath%20d%3D%22M794.665825%20413.647995c-52.14973%200-94.587262%2042.439578-94.587262%2094.587262%200%2052.14973%2042.437531%2094.587262%2094.587262%2094.587262%2052.147684%200%2094.587262-42.437531%2094.587262-94.587262C889.253086%20456.087573%20846.813508%20413.647995%20794.665825%20413.647995z%22%20fill%3D%22%23272636%22%20p-id%3D%2267906%22%3E%3C/path%3E%3C/svg%3E); + --icon-lajitong:url(data:image/svg+xml,%3Csvg%20t%3D%221744885965978%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2269978%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M844.8%20326.4c-19.2%200-38.4%2019.2-38.4%2038.4v550.4c0%2019.2-19.2%2038.4-38.4%2038.4H256c-19.2%200-38.4-19.2-38.4-38.4V364.8c0-19.2-12.8-38.4-38.4-38.4-19.2%200-38.4%2019.2-38.4%2038.4v550.4c6.4%2057.6%2051.2%20108.8%20115.2%20108.8h512c64%200%20115.2-51.2%20115.2-115.2V364.8c0-19.2-19.2-38.4-38.4-38.4z%20m-409.6%20435.2V364.8c0-19.2-12.8-38.4-38.4-38.4-19.2%200-38.4%2019.2-38.4%2038.4V768c0%2019.2%2012.8%2038.4%2038.4%2038.4%2025.6-6.4%2038.4-19.2%2038.4-44.8z%20m224%200V364.8c0-19.2-19.2-38.4-38.4-38.4s-38.4%2019.2-38.4%2038.4V768c0%2019.2%2019.2%2038.4%2038.4%2038.4%2019.2-6.4%2038.4-19.2%2038.4-44.8z%20m326.4-582.4h-179.2V108.8c0-57.6-51.2-108.8-108.8-108.8H326.4c-64%200-108.8%2044.8-108.8%20108.8v76.8H38.4c-19.2-6.4-38.4%2012.8-38.4%2032s19.2%2032%2038.4%2032h947.2c19.2%200%2038.4-12.8%2038.4-32s-19.2-38.4-38.4-38.4z%20m-256%200H288V108.8c0-19.2%2019.2-38.4%2038.4-38.4h371.2c19.2%200%2032%2012.8%2032%2038.4v70.4z%20m0%200%22%20fill%3D%22%23383838%22%20p-id%3D%2269979%22%3E%3C/path%3E%3C/svg%3E) } \ No newline at end of file diff --git a/assets/tabbar/_tab1-active.png b/assets/tabbar/_tab1-active.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf700c06bc5d3e4ed5abce93269312c2cea4b95 GIT binary patch literal 1205 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V9ED%aSW-5 zdpkFyNHOp(IK43gD4xM!J8gSM#6bw0!@k0@ zfy0I6RhO<(K)b3^K)s^QE=uznv<7^xzq~}s$l*>-(t2*i8g2c|SyFN=Gn_b>RFq8ay}9h=aA~dl zvK&V?5A_??;f%{Xm$KBX;ZR{-QXj9ctI7Cw*$MqH1EmWGG`t!Z*Bn{4hAF6V)0I;1 zXqSXXJTd%HSEjp`pPe!Nu236?&-~?i-X;uE33A29<|#41*pQ>VkWt8RDT@k|X~s80 z)dNN~+>ttk#amRFQyfH@?l`J4`*a-O`D5Iw!aU=FSGEtE0`rGBhuJ?b?K93?dv7O? z&+CUgUR6lLkKTH3^_V?r?BXP!bUA0ETbbDIR+n%@sR4 z92h&A1>Uf}Fg(inCe2QDUkZcjtlr$SuOCV}n9kw4R=-PEN%cTmcu;l?12QaQj^;~X zQ9Y^tIWOVwfj|K(_l~;?EBfo&PRqJhiz@6q&%EN7=bY$OO$@1%8+ii0{Rw}^A#f;h zYVfuC-o2|DV>9jd*Ogp}U2ma$;PgB84L)*y3TSYFtF7;rP9b47wi}iEEx(=+g zi@WsZrOEA7onJNw4y*P$8=Z*}>f|)oBl)&*llM1Cg#(vG49<(SGWbnvOler9#5{rV z759chrq-yb$q(;7T`zHCd#q@-WP1>Egk8Dc?M2=PWDW$)Yh>_qNjQ~qE|Zy2fnl~| z4%u`B-n*nEkF z*t=e5fdjXDI)A^Oz_9uIp`#Znd9T|GKkQ*xZ6o@olQZJryfkg+ctr=c0Nd6U1|&|2 zD}(=mOV_oTf|NM|{wgvs{y95y%W(k*uI2j^1PD} Td-^%B9AfZv^>bP0l+XkKAOY&U literal 0 HcmV?d00001 diff --git a/assets/tabbar/_tab1.png b/assets/tabbar/_tab1.png new file mode 100644 index 0000000000000000000000000000000000000000..d7480c2e1b2ccd0fcc90141a63afab3f747f4a4b GIT binary patch literal 1132 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 KlhH_LU-&OB`6?6u literal 0 HcmV?d00001 diff --git a/assets/tabbar/tab1-active.png b/assets/tabbar/tab1-active.png index 9cf700c06bc5d3e4ed5abce93269312c2cea4b95..8aae119295d448173c67723b0b09c1eeff60aaf3 100644 GIT binary patch delta 1600 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 Td-^%B9AfZv^>bP0l+XkKAOY&U diff --git a/assets/tabbar/tab1.png b/assets/tabbar/tab1.png index d7480c2e1b2ccd0fcc90141a63afab3f747f4a4b..3f92831db0a564ed4ab70909d902f7726dc3d40c 100644 GIT binary patch delta 1696 zcmYL|X;hPU7RLW?7Lt${BM1V51Y{@BKuH^Hkr#+UE>%ug3&d@x(idnTv(c~d3{u|Qm^mxUbb*pc(7rzekVOY zGl`Nsa`17E-_@<^$amVk64O%(pt1uZ-6Ge~&4x)Lrhw0VeU;*wsyCUZOK7$&w{PDb zm8=-WgC2J1tJDFX%$mU?!kqm4j=>!|Uk`A<|7 zdaWiV(F<2`pkY02y<+QhyW7u^LFb!de?>46FayEBKYo~{@}OR#%eQ%=h2d?{-wHEB z##Z+yR*6S=QADyGM2}wU`ek8ZVe4piVn)DTAD=VAp*2qL;xm!*-o1YpXx#00F9qnx z&g4M|k!3j7FRA5LAj@5HfFdVKfSB^cYs>bNMDPHw+CQz;YRRMBGr%cliIDJJ5u}RJ z4YG{^pIR)-b*~n&AXwEW-&ak6aA=fxd^s36r3D(W)4V)UsH1{!@Y_Q>tQh)xtJwgQ zD~KZsh&N9=ifv%OmDFhxMHo+&0c-%+6bexkltgp((2Z%*;hvi68YUskOzI7U;3XJ< z=6$yHoB?>f&|0t(JTt#amD(~)^?R1@TA}ywzEPqLa0%{Ah>SIj5x+fBuj$X{zO}uO4n)hir z3ouTMHnIZo0M$i));QET2#}wjUeK`8Eohb|K&NdiNhg8r6&m{x9IV33sc(*(4WN{aO4$ap!at!Ezs&@)Gb@wR65r=l>Fd+VFHH<+((4(m= zLWbz|FJAq2x@>&PwT6GZPeic0f@%qh697V8;1VbpNFWWE1#JgZJQl7?<*{Hoo7IKHrvb<2dI`Q`KQd+D3kSpb4gJzeRfu7Vz$KS8PCoY2?J% z_qfdh$+Hb+o4CA75RZ@4X^jC6nRpDlhNY~;QDq8CbA$pLun|!~$|r@}|GKVpNCci> z^N6~}7jMSc3YSBUg^k7aa(y`7iJ`GX{)dtj3tpV{hKGaZ`9ST^TWHEqqd9dUAkI_p)z@#3Viv}IdLm%zN2Mjv|S&| zdED~P&i3>bLb+8RgJoTs(OQH!_XSC`65me)cLv>RaMn(3uc@&wFg*~o*NdAPMPBnd zGwyYx*+%xseNI=Hanm+%^DBHdtEgZaAfb20X&b2n*jo_nw&+_Z6IC+BTR>{*1`e3H zKBgiO|3cCz^sAc5Ip1aoL+`>lfdfw%5H~%vx!C&=3g-2(-_15plKAu~%T@@mz9@b7 zoIv}*RVutV0YI-d&9(b4_+Cl0-g%enQ-9xZh~_xDQDRva+q(Yx*fFnTu~}cgxMLFR lnL8(E7KprK?h|)(%#DG~;qLo_)8a2E{14}$+))4k delta 1099 zcmaiz`%hDM0L8!e_FlZSR$6RJtq28S^0u2XAXvFTkpdH1G_inS32r=!v17*Z5PJ(W z5FWOm!v_L|Orgl2I&efW>mZ6aL6L@m0qIER4A8AYoe~7sY=6Mc&nG82pPVy5UBWax z1@cL(AmT_tx}_+_d}QQ#bJy&JK7R5$-^Kv~PWE>z+fnl2Z*t-OC)jjG;?|?N zNP;fwsd*QsxrWdH>=naZwTS_yaaEcpVjwP_kJKl+qXZbC3lEeq04$`x=O3C#=F~~u zlAnY4 zcoIzi@UUYgB%At|_>&c#IjPMwT=i=27Nj3;{qnwofFyRfjV9hLkhNOe0sNZ2Hf<=qB6)`O3 ztHq7rkE!8@)JCvj?XYdNUn z*MPD!iw8agqs5~uXV>q%p$@e&4CI^NtM|IalFyf?jh|AaA(2GU)rn0V!&VQNOu%v< zV+euHJcy`O#q}qp5`Rq=ijG@e`UaZrxytUf>KsksPv;%23;uQW;2bH>GSVYazZxu(cJ3D7yC7sMeCeH!FGBNNsNlHD3j&_zqt$gq_pJ zF_R$<5t{U<72`SU%`Z&fK!hNa4KE~^q!YW+?0+Wx-=EhLf0Qv>*il&_z^>Tn1VMMC GwDccNWwL<) diff --git a/assets/tabbar/tab2-active.png b/assets/tabbar/tab2-active.png index cd4ba9e84fb788c9301cbf5a453840e53427a1bc..c9c65fdacafb1db9c16102ee5a93ce3204de6a34 100644 GIT binary patch delta 2074 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 Ef?q$bfB*mh delta 2228 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 diff --git a/assets/tabbar/tab3-active.png b/assets/tabbar/tab3-active.png index a383bd087c4e8fbe7e2e9b3d1da5ce421629da0e..b518d47eac3dd400f16ac93a0b75d4d49cd3a219 100644 GIT binary patch delta 1696 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 diff --git a/assets/tabbar/tab3.png b/assets/tabbar/tab3.png index e06a03b2f37b9422ef158a5923075972bcfa0c9e..1f280b926c01c06fda35031ef12c4ba56cc360be 100644 GIT binary patch delta 1734 zcma)*`9IW&AIIOH8N)c6Jcd?UMkpgRIWic{3^_(=nFg`Ba+Iqks*%)u9P9e3tlS%B z6NX2mmRjVtX^~`E$L>0^`*r2mT;m#Ff5P|m!}Ia{`T2Ofsud>X(@ya7S*MwtNU!<) zF!m%xF5!pps_(keCWyV~DgPK&NfiyBh|5h2JIKnaaC;&8sp@a*EVYL8e8qie z`=)Hmcq6j-1?0*hk+$~&lPk+e-)h~gBr9KKa;4Ghzdw(eRK)NAm84rwC}7;+4ZoqG z;lSA$V{QJbN6@P!kx110cc6^vb!_uSbOG`0)|?{w!VEo_akKWK8cpv=EeMR4BLs9h z{hM!@toH#PWW9WLlrtt0WJ1Jb{rRi7ovfD`e~w`#dci*5yX{~0w+e~a8-93Mw0(lS zM9e)tqaFVbUK!&LKRbFG9X-PzKh&|mZ!pbP`p}tQw3|0S7({6N zRbzq-womvcL9);QzsjH`{n7@dhG=6I4(DM(tSH$=*`t`lq{qf_fj zFd3TA&Na5Yt3eJP0hZ5Q(MC zHJxQ<-kUz+RM+~d?{m_vowUI1)`VH@AV1fJjgTuiozGHY)#%YxzUJ=X#eEs~3Klh= zuFPH#ja!?>bWLZzTM9fltv-HOR0;NPmDeOTeH+7VR`M2umAU$t-Vq{Y8!d3X3)05g z$lbcvCtVLX`keGCGa5|YstKvxt3hmLjq`n$syj&4m`K@eB{M<=vp-9?v8sU#F~_q{ z#Oup)fyCP=&gCal&!8B=@0Y$AHPVry%p-3u;<}r<>QjzYNVb|LQ{ak}cgT9$wR$$m zWL-OfEKLBs`j)uUpr^-&P5xk!qMhmFgvaC0BE47Estr9cHf6!?BjWR4w6KHJ(&}Mr zuGg11+vKWHh4(~sBWT3?KYBGh$w%N-F6m0h0TRDr!}Z)J(7?6Kx?4qnmV(vycXaW6 zqi->>C14-77-YI&rj`EhEAekH0wIzsY0_ra@#DjKX=r_*eyN~adTr!|BHm-w!Vw5J zw(F(E+ds*5OnzUj?RBd3mk|GQEJ?uUwR}KqR%~QJ=ZB;I>hmY}eifV@TMpc$*Etw| zP(SZi6Y3nPW{0f`;cKsjymX%d^F%DuQAsEXN4G*0s$AjB^R8T#0ZxoAaAU`!CW?%? zc~cSFoMWtRWZH2v8=Onu)o>VJgTjF2tRF+qkbeO1*poECMEu$JFgykajMhG|S&N;q0I;51h1)fxx=&<RA^RbXb8B*B~LmO(JdJs7M)#p?^e2(6CeG1^P+$~!PxYd~W^D@0Gp|l~cxH1a% N#?8o&y)wN`uqI5+w z>R7Wzv|&0rW=>_Am@H*P3PtIdxkuUNc)jjFa6iAjfBXFO`An#`k~lviUp!nGeo0}U z%l0R{p{uy=Ft7ZR`1*VF!#k1wSLKcUnuejd)^4>QCe#I!SeR0vHeX2gwNwhRM>%GB z&a0naV7&}&)DU4}4t2~?fy#^@p+o)f^eS6U! zkuI2+M|1^^Q=0qwk+&}uYL4sh)L z!sV3oY&nsc2rOJydezFiTg94yOlIAX675|jNSu3&CnCm!UknvzxCs4Gh|QeDh`vBH z`xv3e8Xa9-3cF}B*e}L5(G^Ll{y~Ql7U_;1ovRNL=%;_Tk($BAi5n-zzlJVJ`SMzo z@^$b`D!Kc1Q~{|7)di8Fm`lhX1{`Nt85N52^33Wzg3+4Z^+mwFbW7w&*km%9WD8QP zklN#&|90KF8IZY-`?5-tHBy8NX|#12yx3aifHNLM3EhXgBK(rRgqy;6pth1LVwIx_ z)HPv&8soXB80NQ;||uzunAK#%9Nh8X)5j0v!J->#uKtYn{Y065OYiA7X@91C{!|!-ODT__VnJ)RaPp z#0Q)FwpL-LPv+?B+y?1eem!+_gWn=!rXdkh;?JM1mHrJ4EeNY~M>hpL7~T>5f$0mA zwY|(J8W5N3t-b7X5yyWwPP9X(nY%T>^gzv+UgY>KLxt@A_Uo{0L579dhN?IRp%WhX zY^ETkM(Q9Bj}sK>GL>sKhi+uvl6^tlt_j3%IpZais!@S!2o#x7( z%W!!dQL}9Rd2bnh76$BG9y2t;RfqMI@opLl{73Xz2LOgk=pNp?)Kd9NaP<+X!qoX9fO#7mYGO#JsDZr7~BOWwqQA@rc6F^}7SomnwRs58%hv>vNWCOX$7ia(#1_XgB|*Gw*#$kthRjI~Edt{# zs1tD`e9y*{FD1=v+(p=+%_+gKEh+n-6vNGRE!MbRV4)Ln%ZbzxG(Zc9Q3nzc`FUQ2 zv76IiL&p`hdstrY_j(o7w$IWV&)EJ=3c<(^@sVRx8wGME^xeY}U3iR$UR%y5I@E7- z-}?2G)_sT$O)&wpu=UU5}H{SRV=;7ewg|7wZ9>f#TxjSIW zUI(kKn5;yA;M=ejuv~m5V!5^YK~|u8`IvkHxcl*=0@VKpQE@GLcOwnryfjZVOTpD) zdZ^{PXl|P1%3|zsDtkYK0OZWu#+~4oa}?lXTko3vI%Sg$#j_=Y#`6c^hl7@fP2?n+ zCTOBrKkAa6iV|7z+x#noH-oW=w?&AZUlD-sgbTeATGmGU#^3%X@T8&*WdP%tMs@5M z)#K#eH-h$Z2kpI2_X1ls-)edUh{Z$a%$b!!Jp2WeIE%L+;6ApRbTMF@x(~|27_PlU zSlV=uw12lZ;Ur%3oY7j1ZON)UN3ATWb&QcZ){ + return { + title:'我的美搭，分享给你', + imageUrl:this.properties.data.completion_url, + path:`/pages/try/index/index?shared_history_id=${this.properties.data.id}` + } + } + }, + afterLeave(){ + this.triggerEvent('afterLeave') + }, + closeModal(){ + this.selectComponent('#modalView').cancelButtonTap(); + } + }, + lifetimes:{ + ready(){ + const windowInfo = wx.getWindowInfo(); + console.log(this.properties.pageHeight,windowInfo.windowHeight); + this.setData({ + maxHeight:(this.properties.pageHeight||windowInfo.windowHeight)-40 + }) + } + } + +}) \ No newline at end of file diff --git a/component/share-modal-view/index.json b/component/share-modal-view/index.json new file mode 100644 index 0000000..73f7697 --- /dev/null +++ b/component/share-modal-view/index.json @@ -0,0 +1,7 @@ +{ + "component": true, + "styleIsolation": "page-shared", + "usingComponents": { + "modal-view":"/miniprogram_npm/@beefast-wxmp/modal-view" + } +} \ No newline at end of file diff --git a/component/share-modal-view/index.wxml b/component/share-modal-view/index.wxml new file mode 100644 index 0000000..4fb95d1 --- /dev/null +++ b/component/share-modal-view/index.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + {{data.score}} + AI 点评： + {{data.comment}} + + + + + diff --git a/component/share-modal-view/index.wxss b/component/share-modal-view/index.wxss new file mode 100644 index 0000000..214df03 --- /dev/null +++ b/component/share-modal-view/index.wxss @@ -0,0 +1,124 @@ +.comment-modal-view .modal-view-main{ + padding:0; + overflow: hidden; +} +.comment-modal-view .modal-view-main .close-btn-area{ + right:0;top:0; +} +.comment-modal-view .modal-view-main .close-btn-area .close-btn{ + content: ''; + top:0;left:0; + border-radius: 50%; + background-color: rgba(0, 0, 0, .2); +} +.comment-modal-view .modal-view-main .close-btn-area .close-btn::after{ + width:1em;height:1em; + -webkit-mask-position:0 0; + mask-position:0 0; + -webkit-mask-repeat:no-repeat; + mask-repeat:no-repeat; + -webkit-mask-size:100%; + mask-size:100%; + background-color:currentColor; + color: #ddd; + mask-image: var(--icon-plus); + -webkit-mask-image: var(--icon-plus); + font-size: 36rpx; + transform: rotate(45deg); + left:10rpx; + top:8rpx; +} +.comment-modal-view .modal-view-main .close-btn-area .close-btn::before{ + display: none; +} +.comment-modal-view .modal-view-main .close-area{ + position:absolute; + right:0;top:0; + background-color: rgba(0, 0, 0, .2); + width:70rpx;height:70rpx; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + border-radius: 50%; +} +.comment-modal-view .modal-view-main .image-area{ + width:100%; + /* 54是弹出框左右的宽度 */ + height:calc((100vw - 54px)*4/3); + /* flex:1; */ + position: relative; +} +.comment-modal-view .modal-view-main .image-area .image{ + width:100%;height:100%; + vertical-align: middle; +} +.comment-modal-view .modal-view-main .image-area .top-bottom{ + position: absolute; + bottom:20rpx; + left:20rpx; + display: flex; + flex-direction: column; + gap: 20rpx; +} +.comment-modal-view .modal-view-main .image-area .top, +.comment-modal-view .modal-view-main .image-area .bottom{ + width:140rpx; + height:140rpx; + border-radius: 20rpx; +} +.comment-modal-view .modal-view-main .comment{ + padding:40rpx; + position: relative; +} +.comment-modal-view .modal-view-main .point{ + display: flex; + justify-content: center; + align-items: baseline; + + color:var(--main-color); + font-size: 70rpx; + line-height: 70rpx; + font-weight: bold; +} +.comment-modal-view .modal-view-main .point::after{ + content:'分'; + line-height: 30rpx; + font-size: 30rpx; + font-weight: normal; + margin-left:10rpx; + color: var(--main-font-color); +} +.comment-modal-view .cmt-title{ + font-size: 36rpx; + font-weight: bold; + margin:20rpx 0; +} +.comment-modal-view .cmt-content{ + line-height: 40rpx; + text-indent: 2em; +} +.comment-modal-view .button{ + margin-top:40rpx; +} +.comment-container{ + display: flex; + flex-direction: column; +} + +@media (min-aspect-ratio:5/9){ + .comment-modal-view .modal-view-main .comment{ + padding:20rpx; + } + .comment-modal-view .modal-view-main .point{ + position:absolute; + left:160rpx; + top:22rpx; + font-size: 40rpx; + } +} +/* @media (min-aspect-ratio:3/5){ */ + /* .comment-modal-view .modal-view-main .image-area{ + height:calc(100vw - 54px); + } */ +/* } */ \ No newline at end of file diff --git a/pages/closet/index/index.js b/pages/closet/index/index.js index fff6ca5..b98f55a 100644 --- a/pages/closet/index/index.js +++ b/pages/closet/index/index.js @@ -22,10 +22,16 @@ Page({ hasDefaultImage:false, topClothingCId:'', - bottomClothingCId:'' + bottomClothingCId:'', + + statusBarHeight:0 }, onLoad() { + const windowInfo = wx.getWindowInfo(); + this.setData({ + statusBarHeight:windowInfo.statusBarHeight, + }) this.loadClosetList(); clothingAPI.getCategories().then((data)=>{ data.map((item)=>{ @@ -104,7 +110,8 @@ Page({ }, addClothing(){ this.setData({ - isShowUploader:true + isShowUploader:true, + uploadImg:{} }) }, chooseImg(){ diff --git a/pages/closet/index/index.wxml b/pages/closet/index/index.wxml index bb466c5..01bae76 100644 --- a/pages/closet/index/index.wxml +++ b/pages/closet/index/index.wxml @@ -2,9 +2,9 @@ 我的衣橱 - + + + + + + \ No newline at end of file diff --git a/pages/my/history/list.wxss b/pages/my/history/list.wxss new file mode 100644 index 0000000..e1c9a8e --- /dev/null +++ b/pages/my/history/list.wxss @@ -0,0 +1,65 @@ +.images-list{ + height:100vh; +} +.item-container{ + padding:0 20rpx; + display: flex; + flex-wrap: wrap; + gap: 20rpx; + margin-top:20rpx; +} +.images-list .item{ + width:calc(50vw - 30rpx); + height:calc((50vw - 30rpx)/3*4); + border-radius: 20rpx; + overflow: hidden; + position: relative; +} +.images-list .item .loading-area{ + position: absolute; + left:0;right:0; + width:100%;height:100%; + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, .3); + color:#fff; + font-size: 60rpx; +} +.images-list .default-mark{ + position: absolute; + top:0;left:0; + background-color: var(--main-color); + color: #fff; + font-size: 24rpx; + font-weight: bold; + padding:10rpx; + border-radius: 0 0 20rpx 0; +} +.images-list .image{ + width:100%;height:100%; +} +.images-list .btn-close{ + width:50rpx;height:50rpx; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + right:0;top:0; + border-radius: 0 0 0 20rpx; + font-size: 22rpx; + color: #777; + background-color: rgba(0, 0, 0, .1); +} +.images-list .btn-share{ + position: absolute; + bottom:30rpx; + left:0; + font-size: 24rpx; + font-weight:normal; + left:50%; + margin-left:-2.5em; + display: flex; + align-items: center; + gap:10rpx; +} diff --git a/pages/my/images/index.js b/pages/my/images/index.js index 172af74..90d7f35 100644 --- a/pages/my/images/index.js +++ b/pages/my/images/index.js @@ -1,4 +1,5 @@ import userAPI from '../../../api/user'; +import commonAPI from '../../../api/common'; Page({ @@ -9,7 +10,9 @@ Page({ list:[], scrollViewHeight:0, autoBack:false, - pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false} + pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}, + + uploadImg:{} }, /** @@ -125,7 +128,45 @@ Page({ list:this.data.list }) }else{ - refreshList(); + this.refreshList(); + } + }) + }, + + chooseImg(){ + wx.chooseMedia({ + count:1, + success:(res)=>{ + wx.cropImage({ + cropScale:'3:4', + src: res.tempFiles[0].tempFilePath, + success:(_res)=>{ + _res.uploading = true; + this.setData({ + uploadImg:_res + }) + commonAPI.upload(_res).then((data)=>{ + this.setData({ + "uploadImg.serverUrl":data.url + }); + userAPI.addPersonImages(data.url).then(()=>{ + this.setData({ + uploadImg:{} + }) + this.refreshList(); + }) + }).finally(()=>{ + this.setData({ + 'uploadImg.uploading':false + }) + }); + _res.task.onProgressUpdate((detail)=>{ + this.setData({ + uploadPercent:detail.progress + }) + }) + } + }) } }) }, diff --git a/pages/my/images/index.wxml b/pages/my/images/index.wxml index 07d3487..9470cef 100644 --- a/pages/my/images/index.wxml +++ b/pages/my/images/index.wxml @@ -7,6 +7,18 @@ show-load-more="{{!(list.length==0&&pager.loadAll)}}" loading="{{pager.loading}}" load-all="{{pager.loadAll}}"> + + + + + + + + + + 上传新的形象照 + + diff --git a/pages/my/images/index.wxss b/pages/my/images/index.wxss index 36c9e2e..ba8271c 100644 --- a/pages/my/images/index.wxss +++ b/pages/my/images/index.wxss @@ -6,6 +6,7 @@ display: flex; flex-wrap: wrap; gap: 20rpx; + margin-top:20rpx; } .images-list .item{ width:calc(50vw - 30rpx); @@ -14,6 +15,29 @@ overflow: hidden; position: relative; } +.images-list .item.btn-upload{ + background-color: #ddd; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 20rpx; + color:#666; +} +.images-list .item .loading-area{ + position: absolute; + left:0;right:0; + width:100%;height:100%; + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, .3); + color:#fff; + font-size: 60rpx; +} +.images-list .btn-upload .cloud{ + font-size: 80rpx; +} .images-list .default-mark{ position: absolute; top:0;left:0; diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml index 385ff12..9e44f7b 100644 --- a/pages/my/index/index.wxml +++ b/pages/my/index/index.wxml @@ -12,16 +12,21 @@ 我的形象照 + + + 我的试穿 + + 个人设置 - - 用户协议 + + - + - - - - - - - - 失败 - - - - - - - - + + + + + + + + + 失败 + + + + + + + + + + 更多 + + + + - + + \ No newline at end of file diff --git a/pages/try/index/index.wxss b/pages/try/index/index.wxss index 22c5874..14ace53 100644 --- a/pages/try/index/index.wxss +++ b/pages/try/index/index.wxss @@ -5,6 +5,7 @@ } .try-container .header{ font-size: 52rpx; + line-height: 88rpx; font-weight: bold; display: flex; align-items: center; @@ -20,11 +21,15 @@ margin-top:20rpx; position: relative; overflow: hidden; + background-color: #eee; } .try-container .main .top-btn{ position: absolute; - right:40rpx;top:40rpx; + right:20rpx;top:20rpx; + background-color: rgba(255, 255, 255, .6); z-index: 100; + font-size: 28rpx; + box-shadow: 0px 6px 6px 1px rgba(0, 0, 0, 0.3); } .try-container .main .upload-btn{ width:100%;height:100%; @@ -80,16 +85,18 @@ .try-container .main .item .image{ width:100%;height:100%; } -.try-container .main .share-area{ +.try-container .main .right-bottom-area{ + position: absolute; + right:20rpx;bottom:20rpx; +} +.try-container .main .right-bottom-area .delete-area{ + border-radius: 50%; + background-color: rgba(255, 255, 255, .7); + width:70rpx;height:70rpx; display: flex; align-items: center; justify-content: center; - font-size: 50rpx; - color: #fff; - margin-left:auto; - background-color: rgba(0, 0, 0, .1); - border-radius: 50%; - width: 80rpx;height: 80rpx; + color: #666; } .try-container .bottom{ margin:40rpx 0 22rpx 0; @@ -98,6 +105,13 @@ .history{ display: flex; flex-wrap: nowrap; + gap: 20rpx; +} +.history .list{ + display: flex; + flex-wrap: nowrap; + overflow: hidden; + flex: 1; } .history .item{ border-radius: 20rpx; @@ -115,6 +129,14 @@ margin-left:16rpx; margin-top:18rpx; } +.history .item .icon.more{ + font-size: 60rpx; +} +.history .item.item-more{ + font-size: 30rpx; + display: flex; + flex-direction: column; +} .history .item:first-child{ margin-left:0; } @@ -171,7 +193,7 @@ margin-top:-20rpx; } -.comment-modal-view .modal-view-main{ +/* .comment-modal-view .modal-view-main{ padding:0; overflow: hidden; } @@ -204,13 +226,33 @@ .comment-modal-view .modal-view-main .close-btn-area .close-btn::before{ display: none; } -.comment-modal-view .modal-view-main .main-img{ +.comment-modal-view .modal-view-main .image-area{ width:100%; - /* 54是弹出框左右的宽度 */ + 54是弹出框左右的宽度 height:calc((100vw - 54px)*4/3); + position: relative; +} +.comment-modal-view .modal-view-main .image-area .image{ + width:100%;height:100%; + vertical-align: middle; +} +.comment-modal-view .modal-view-main .image-area .top-bottom{ + position: absolute; + bottom:20rpx; + left:20rpx; + display: flex; + flex-direction: column; + gap: 20rpx; +} +.comment-modal-view .modal-view-main .image-area .top, +.comment-modal-view .modal-view-main .image-area .bottom{ + width:140rpx; + height:140rpx; + border-radius: 20rpx; } .comment-modal-view .modal-view-main .comment{ padding:40rpx; + position: relative; } .comment-modal-view .modal-view-main .point{ display: flex; @@ -241,4 +283,22 @@ } .comment-modal-view .button{ margin-top:40rpx; -} \ No newline at end of file +} + +@media (min-aspect-ratio:5/9){ + .comment-modal-view .modal-view-main .comment{ + padding:20rpx; + } + .comment-modal-view .modal-view-main .point{ + position:absolute; + left:160rpx; + top:22rpx; + font-size: 40rpx; + } +} +@media (min-aspect-ratio:3/5){ + .comment-modal-view .modal-view-main .image-area{ + height:calc(100vw - 54px); + } +} */ + diff --git a/project.private.config.json b/project.private.config.json index b98f2e8..f8d301f 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,7 +9,7 @@ "list": [ { "name": "测试分享码", - "pathName": "pages/my/login/index", + "pathName": "pages/try/index/index", "query": "shared_user_code=ASSDJK", "launchMode": "default", "scene": null @@ -17,12 +17,12 @@ { "name": "测试分享穿搭", "pathName": "pages/try/index/index", - "query": "shared_history_id=33", + "query": "shared_history_id=44", "launchMode": "default", "scene": null } ] } }, - "libVersion": "3.7.12" + "libVersion": "3.8.0" } \ No newline at end of file