lhmin0604andClaude
3de6128cae
8fdf0b1(R3) 基于 a13e380 却用旧工作区副本覆盖了 R2 域文件，导致终版
(feat/r1-catalog) 上 R2 功能丢失。本提交在不改动 R1/R3 域文件的前提下恢复：
- 整文件恢复（纯 R2 域）：diy/index.tsx+scss（批次①②③全部修正）、
stickerEdit（批次③）、api/address.ts（region 转换收口）、
store/design.ts+address.ts（缓存层语义文档）、address 页（真机验收版）
- 手工合并：api/design.ts（R2 契约实现为基底 + R3 需要的 fetchDesign）、
types/index.ts（DesignDataV1.category 收窄 {id,mask,tone}、productIcon
optional、AddressItem.createdAt 恢复；保留 R1 ProductCategory 扩展与
R3 OrderItem 扩展）、designList 页（缓存优先 load + processing 徽标）
- 保留不动（其他链路域）：checkout/orders/orderDetail/shop/index/profile、
api/order.ts、api/product.ts、productAdapter、request.ts（R3 构建期注入）、
keys.ts（R3 mock 处理）、product 页（R1 已实现等价服务端写入）
验证：build:weapp 通过；tsc 错误集合与恢复前对比，R1/R3 文件零变化。
Co-Authored-By: Claude <noreply@anthropic.com>
1 line
12 KiB
JavaScript
1 line
12 KiB
JavaScript
"use strict";(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[481],{4501:function(e,s,n){var a=n(5712),t=n(1393),i=n(9346),r=n(1433),c=n(408),l=n(3048),o=n.n(l),u=n(2785),d=n(1679),p=n(1986),g=n(1872),h=n(4521),m=n(9093),f=n(2728),x=n(2322),v=n(2763),N=n(7042),j=n(225),S=n(6517),b={"\u6211\u7684\u8bbe\u8ba1":(0,N.uq)("/icon/\u8c03\u8272\u76d8.png"),"\u8bcd\u4e91\u751f\u6210":(0,N.uq)("/icon/\u8bcd\u4e91\u751f\u6210.png"),"\u6536\u8d27\u5730\u5740":(0,N.uq)("/icon/\u5730\u5740.png"),"\u8054\u7cfb\u5ba2\u670d":(0,N.uq)("/icon/\u7535\u8bdd.png"),"\u4f7f\u7528\u5e2e\u52a9":(0,N.uq)("/icon/\u4f7f\u7528\u5e2e\u52a9.png"),"\u8bbe\u7f6e":(0,N.uq)("/icon/\u8bbe\u7f6e.png")},k=[{key:"toDesign",label:"\u5f85\u8bbe\u8ba1",icon:(0,N.uq)("/icon/\u4e09\u89d2\u5c3a.png")},{key:"pending",label:"\u5f85\u4ed8\u6b3e",icon:(0,N.uq)("/icon/\u56db\u89d2\u661f.svg")},{key:"paid",label:"\u5f85\u53d1\u8d27",icon:(0,N.uq)("/icon/\u5305\u88f9.png")},{key:"shipping",label:"\u5f85\u6536\u8d27",icon:(0,N.uq)("/icon/\u676f\u5b50.png")},{key:"done",label:"\u5df2\u5b8c\u6210",icon:(0,N.uq)("/icon/\u4e66\u672c.png")}],w=[{label:"\u6211\u7684\u8bbe\u8ba1",path:"/pages/designList/index"},{label:"\u8bcd\u4e91\u751f\u6210",path:"/pages/wordcloud/index"},{label:"\u6536\u8d27\u5730\u5740",path:"/pages/address/index"},{label:"\u8054\u7cfb\u5ba2\u670d",path:"/pages/service/index"},{label:"\u4f7f\u7528\u5e2e\u52a9",path:"/pages/agreement/index"},{label:"\u8bbe\u7f6e",path:"/pages/settings/index"}],T=function(){};function y(){var e=(0,p.wR)(),s=(e.theme,e.resolvedTheme),n=(0,g.c)();(0,h.l)(s);var a=(0,u.useState)(!1),y=(0,r.A)(a,2),A=y[0],E=y[1],Y=(0,u.useState)({nickName:"",avatarUrl:""}),q=(0,r.A)(Y,2),P=q[0],D=q[1],U=(0,u.useState)(!1),F=(0,r.A)(U,2),_=F[0],C=F[1],L=(0,u.useState)("entry"),V=(0,r.A)(L,2),I=V[0],O=V[1],G=(0,u.useState)(""),H=(0,r.A)(G,2),J=H[0],B=H[1],M=(0,u.useState)(""),R=(0,r.A)(M,2),z=R[0],W=R[1],$=(0,u.useState)(!1),K=(0,r.A)($,2),Q=K[0],X=K[1],Z=(0,u.useState)({toDesign:0,pending:0,paid:0,shipping:0,done:0}),ee=(0,r.A)(Z,2),se=ee[0],ne=ee[1],ae=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s,n,a;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return s=(0,d.p_)(),e.p=1,e.n=2,(0,j.Gb)({page:1,pageSize:100});case 2:n=e.v.list,ne({toDesign:s.filter(function(e){return"undesigned"===e.status||"designing"===e.status}).length,pending:n.filter(function(e){return"PENDING"===e.status}).length,paid:n.filter(function(e){return"PAID"===e.status||"PROCESSING"===e.status}).length,shipping:n.filter(function(e){return"SHIPPED"===e.status}).length,done:n.filter(function(e){return"COMPLETED"===e.status}).length}),e.n=4;break;case 3:e.p=3,e.v,a=(0,d.n7)(),ne({toDesign:s.filter(function(e){return"undesigned"===e.status||"designing"===e.status}).length,pending:a.filter(function(e){return"pending"===e.statusCode}).length,paid:a.filter(function(e){return"paid"===e.statusCode}).length,shipping:a.filter(function(e){return"shipping"===e.statusCode}).length,done:a.filter(function(e){return"done"===e.statusCode}).length});case 4:return e.a(2)}},e,null,[[1,3]])}));return function(){return e.apply(this,arguments)}}(),te=function(){var e=(0,d.ug)();e&&e.openid?(E(!0),D({nickName:e.nickName||"",avatarUrl:e.avatarUrl||""})):(E(!1),D({nickName:"",avatarUrl:""})),ae()};(0,l.useDidShow)(function(){te()});var ie=function(){O("entry"),B(""),W(""),C(!0)},re=function(){return C(!1)},ce=function(e){X(!1),(0,v.Sy)(),o().showToast({title:e,icon:"none"})},le=function(e,s,n,a){var t={openid:s,nickName:n||"\u5fae\u4fe1\u7528\u6237",avatarUrl:a||"",accessToken:e,loginAt:Date.now()};(0,d.iA)(t),D({nickName:t.nickName,avatarUrl:t.avatarUrl}),E(!0),C(!1),O("entry"),X(!1),(0,v.Sy)(),o().showToast({title:"\u767b\u5f55\u6210\u529f",icon:"success"})},oe=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s,n,a,i,r,c;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:if(!Q){e.n=1;break}return e.a(2);case 1:return console.log("[Profile] \u767b\u5f55\u6309\u94ae\u88ab\u70b9\u51fb\uff0c\u5f00\u59cb\u767b\u5f55\u6d41\u7a0b"),X(!0),o().showLoading({title:"\u767b\u5f55\u4e2d",mask:!0}),e.p=2,e.n=3,o().login();case 3:return s=e.v,console.log("[Profile] wx.login \u6210\u529f\uff0ccode=",s.code),e.n=4,(0,x.iD)(s.code);case 4:if(n=e.v,console.log("[Profile] \u540e\u7aef /auth/login \u8fd4\u56de:",JSON.stringify(n)),n&&n.accessToken){e.n=5;break}return ce("\u767b\u5f55\u5931\u8d25\uff0c\u672a\u62ff\u5230 token"),e.a(2);case 5:return a="",e.p=6,e.n=7,(0,x.jp)();case 7:i=e.v,a=i&&i.openid||"",e.n=9;break;case 8:e.p=8,e.v,a="";case 9:if(a){e.n=10;break}return ce("\u767b\u5f55\u5f02\u5e38\uff0c\u8bf7\u91cd\u8bd5"),e.a(2);case 10:if(r=n.isNewUser||!n.nickname||!n.avatar,!r){e.n=11;break}return B(n.nickname||""),W(n.avatar||""),(0,v.Sy)(),X(!1),O("fill"),o().showToast({title:"\u8bf7\u8bbe\u7f6e\u5934\u50cf\u548c\u6635\u79f0",icon:"none"}),e.a(2);case 11:le(n.accessToken,a,n.nickname||"",n.avatar||""),e.n=13;break;case 12:e.p=12,c=e.v,console.error("[Profile] \u767b\u5f55\u6d41\u7a0b\u51fa\u9519:",c),ce(c&&c.message||"\u540e\u7aef\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5\u7f51\u7edc");case 13:return e.a(2)}},e,null,[[6,8],[2,12]])}));return function(){return e.apply(this,arguments)}}(),ue=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s,n,a,i;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:if(!Q){e.n=1;break}return e.a(2);case 1:return X(!0),o().showLoading({title:"\u4fdd\u5b58\u4e2d",mask:!0}),e.p=2,e.n=3,(0,x.r7)({nickname:J||void 0,avatar:z||void 0});case 3:return s="",e.p=4,e.n=5,(0,x.jp)();case 5:n=e.v,s=n&&n.openid||"",e.n=7;break;case 6:e.p=6,e.v,s="";case 7:if(s){e.n=8;break}return ce("\u4fdd\u5b58\u5f02\u5e38\uff0c\u8bf7\u91cd\u8bd5"),e.a(2);case 8:a=(0,d.ug)(),le(a&&a.accessToken||(0,x.gf)(),s,J,z),e.n=10;break;case 9:e.p=9,i=e.v,console.error("[Profile] \u4fdd\u5b58\u8d44\u6599\u51fa\u9519:",i),ce(i&&i.message||"\u4fdd\u5b58\u5931\u8d25");case 10:return e.a(2)}},e,null,[[4,6],[2,9]])}));return function(){return e.apply(this,arguments)}}(),de=function(e){W(e.detail.avatarUrl||"")},pe=function(e){switch(o().hideToast(),e){case"toDesign":o().setStorageSync("designList:filter","toDesign"),o().switchTab({url:"/pages/designList/index"});break;case"pending":o().setStorageSync("orders:filter","pending"),o().switchTab({url:"/pages/orders/index"});break;case"paid":o().setStorageSync("orders:filter","paid"),o().switchTab({url:"/pages/orders/index"});break;case"shipping":o().setStorageSync("orders:filter","shipping"),o().switchTab({url:"/pages/orders/index"});break;case"done":o().setStorageSync("orders:filter","done"),o().switchTab({url:"/pages/orders/index"});break}},ge=function(e,s){if(o().hideToast(),!A&&(e.includes("designList")||e.includes("orders")))return o().showToast({title:"\u8bf7\u5148\u767b\u5f55",icon:"none"}),void C(!0);"\u8054\u7cfb\u5ba2\u670d"!==s?e.startsWith("/pages/")&&(e.includes("designList")||e.includes("orders")?o().switchTab({url:e,fail:function(e){console.error("switchTab fail",e),o().showToast({title:"\u8df3\u8f6c\u5931\u8d25",icon:"none"})}}):o().navigateTo({url:e,fail:function(e){console.error("navigateTo fail",e),o().showToast({title:"\u8df3\u8f6c\u5931\u8d25",icon:"none"})}})):o().navigateTo({url:"/pages/service/index",fail:function(e){console.error("navigateTo service fail",e),o().showToast({title:"\u8df3\u8f6c\u5931\u8d25",icon:"none"})}})};return(0,S.jsxs)(c.Ss,{className:"theme-".concat(s),style:{minHeight:"100vh"},children:[(0,S.jsx)(m.A,{}),(0,S.jsx)(f.A,{title:"\u6211\u7684",targetSelector:".profile-header"}),(0,S.jsxs)(c.Ss,{className:"profile-page",children:[(0,S.jsxs)(c.Ss,{className:"profile-header surface-card",style:{marginTop:"".concat(n.statusBarHeight+12,"px")},children:[(0,S.jsxs)(c.Ss,{className:"user-info",children:[A&&P.avatarUrl?(0,S.jsx)(c._V,{className:"avatar",src:P.avatarUrl,mode:"aspectFill"}):(0,S.jsx)(c.Ss,{className:"avatar-placeholder",onTap:ie,children:(0,S.jsx)(c._V,{className:"avatar-icon-img",src:(0,N.uq)("/icon/\u4e2a\u4eba.png"),mode:"aspectFit"})}),(0,S.jsxs)(c.Ss,{className:"user-meta",children:[(0,S.jsx)(c.EY,{className:"user-name",onTap:A?T:ie,children:A?P.nickName:"\u70b9\u51fb\u767b\u5f55"}),(0,S.jsx)(c.EY,{className:"user-level",children:A?"\u667a\u7ed8\u5fae\u523b\u4f1a\u5458":"\u6388\u6743\u5fae\u4fe1\uff0c\u5f00\u542f\u4e13\u5c5e\u5b9a\u5236"})]})]}),(0,S.jsxs)(c.Ss,{className:"status-grid",children:[(0,S.jsx)(c.Ss,{className:"status-row row2",children:k.slice(0,2).map(function(e){return(0,S.jsxs)(c.Ss,{className:"status-group",children:[(0,S.jsxs)(c.Ss,{className:"status-item",onTap:function(){return pe(e.key)},children:[(0,S.jsx)(c._V,{className:"status-icon-img",src:e.icon,mode:"aspectFit"}),(0,S.jsx)(c.EY,{className:"status-num",children:se[e.key]}),(0,S.jsx)(c.EY,{className:"status-label",children:e.label})]}),(0,S.jsx)(c.Ss,{className:"status-divider"})]},e.key)})}),(0,S.jsx)(c.Ss,{className:"status-divider-h"}),(0,S.jsx)(c.Ss,{className:"status-row row3",children:k.slice(2).map(function(e,s){return(0,S.jsxs)(c.Ss,{className:"status-group",children:[(0,S.jsxs)(c.Ss,{className:"status-item",onTap:function(){return pe(e.key)},children:[(0,S.jsx)(c._V,{className:"status-icon-img",src:e.icon,mode:"aspectFit"}),(0,S.jsx)(c.EY,{className:"status-num",children:se[e.key]}),(0,S.jsx)(c.EY,{className:"status-label",children:e.label})]}),s<2&&(0,S.jsx)(c.Ss,{className:"status-divider"})]},e.key)})})]})]}),(0,S.jsxs)(c.Ss,{className:"mt-20",children:[(0,S.jsx)(c.EY,{className:"section-title",children:"\u5e38\u7528\u529f\u80fd"}),(0,S.jsx)(c.Ss,{className:"menu-grid",children:w.map(function(e,s){return(0,S.jsxs)(c.Ss,{className:"menu-card surface-card",onTap:function(){return ge(e.path,e.label)},children:[(0,S.jsx)(c._V,{className:"menu-icon-img",src:b[e.label],mode:"aspectFit"}),(0,S.jsx)(c.EY,{className:"menu-label",children:e.label})]},s)})})]}),(0,S.jsx)(c.Ss,{className:"enterprise-section surface-card mt-20",children:(0,S.jsxs)(c.Ss,{className:"flex-between",children:[(0,S.jsxs)(c.Ss,{className:"flex-column",children:[(0,S.jsxs)(c.Ss,{className:"flex-center",children:[(0,S.jsx)(c._V,{className:"enterprise-icon",src:(0,N.uq)("/icon/\u4f01\u4e1a\u6279\u91cf\u5b9a\u5236.png"),mode:"aspectFit"}),(0,S.jsx)(c.EY,{className:"enterprise-title",children:"\u4f01\u4e1a\u6279\u91cf\u5b9a\u5236"})]}),(0,S.jsx)(c.EY,{className:"enterprise-desc",children:"\u5e74\u4f1a\u793c\u54c1\u3001\u5165\u804c\u7eaa\u5ff5\u3001\u56e2\u5efa\u4f34\u624b\u793c"})]}),(0,S.jsx)(c.Ss,{className:"btn-primary enterprise-btn",children:(0,S.jsx)(c.EY,{children:"\u7acb\u5373\u54a8\u8be2"})})]})}),_&&(0,S.jsx)(c.Ss,{className:"modal-overlay",children:(0,S.jsxs)(c.Ss,{className:"login-card surface-card",children:[(0,S.jsx)(c.EY,{className:"login-title",children:"\u767b\u5f55\u667a\u7ed8\u5fae\u523b"}),"entry"===I?(0,S.jsxs)(S.Fragment,{children:[(0,S.jsx)(c.EY,{className:"login-desc",children:"\u767b\u5f55\u540e\u540c\u6b65\u60a8\u7684\u8bbe\u8ba1\u6e05\u5355\u548c\u8ba2\u5355"}),(0,S.jsxs)(c.Ss,{className:"login-actions",children:[(0,S.jsx)(c.Ss,{className:"btn-secondary",onTap:re,children:(0,S.jsx)(c.EY,{children:"\u53d6\u6d88"})}),(0,S.jsx)(c.Ss,{className:"btn-primary",onTap:oe,children:(0,S.jsx)(c.EY,{children:"\u5fae\u4fe1\u767b\u5f55"})})]})]}):(0,S.jsxs)(S.Fragment,{children:[(0,S.jsx)(c.EY,{className:"login-desc",children:"\u8bf7\u8bbe\u7f6e\u60a8\u7684\u5934\u50cf\u548c\u6635\u79f0"}),(0,S.jsx)(c.$n,{className:"avatar-btn",openType:"chooseAvatar",onChooseAvatar:de,children:z?(0,S.jsx)(c._V,{className:"avatar-img",src:z,mode:"aspectFill"}):(0,S.jsx)(c._V,{className:"avatar-placeholder-img",src:(0,N.uq)("/icon/\u4e2a\u4eba.png"),mode:"aspectFit"})}),(0,S.jsx)(c.pd,{type:"nickname",className:"nickname-input",placeholder:"\u8bf7\u8f93\u5165\u6635\u79f0",value:J,onInput:function(e){return B(e.detail.value)}}),(0,S.jsxs)(c.Ss,{className:"login-actions",children:[(0,S.jsx)(c.Ss,{className:"btn-secondary",onTap:re,children:(0,S.jsx)(c.EY,{children:"\u53d6\u6d88"})}),(0,S.jsx)(c.Ss,{className:"btn-primary",onTap:ue,children:(0,S.jsx)(c.EY,{children:"\u4fdd\u5b58"})})]})]})]})})]})]})}var A={navigationStyle:"custom",enablePageMeta:!0,navigationBarTitleText:"\u4e2a\u4eba\u4e2d\u5fc3"};Page((0,a.createPageConfig)(y,"pages/profile/index",{root:{cn:[]}},A||{}))}},function(e){var s=function(s){return e(e.s=s)};e.O(0,[907,96,76],function(){return s(4501)});e.O()}]); |