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
5.7 KiB
JavaScript
1 line
5.7 KiB
JavaScript
"use strict";(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[486],{9157:function(e,s,a){var n=a(5712),t=a(6004),c=a(1433),i=a(408),l=a(3048),r=a.n(l),o=a(2785),m=a(1986),d=a(1872),u=a(4521),h=a(9093),x=a(2728),g=a(1679),p=a(7042),j=a(6517),N=[{label:"\u6d45\u8272\u6a21\u5f0f",value:"light"},{label:"\u6df1\u8272\u6a21\u5f0f",value:"dark"},{label:"\u8ddf\u968f\u7cfb\u7edf",value:"auto"}],v=[{label:"\u4e2a\u4eba\u4fe1\u606f",icon:(0,p.uq)("/icon/\u4e2a\u4eba.png"),action:function(e){return e.setShowEdit(!0)}},{label:"\u8d26\u53f7\u7ba1\u7406",icon:(0,p.uq)("/icon/\u8d26\u53f7\u7ba1\u7406.png"),action:function(){return r().navigateTo({url:"/pages/userDatabase/index"})}},{label:"\u5b9a\u5236\u534f\u8bae",icon:(0,p.uq)("/icon/\u5b9a\u5236\u534f\u8bae.png"),action:function(){return r().navigateTo({url:"/pages/agreement/index"})}},{label:"\u5173\u4e8e\u6211\u4eec",icon:(0,p.uq)("/icon/\u5173\u4e8e\u6211\u4eec.png"),action:function(){return r().showToast({title:"\u667a\u7ed8\u5fae\u523b v1.0",icon:"none"})}}];function f(){var e=(0,m.wR)(),s=e.theme,a=e.setTheme,n=e.resolvedTheme,l=(0,d.c)();(0,u.l)(n);var f=(0,o.useState)({}),S=(0,c.A)(f,2),b=S[0],T=S[1],E=(0,o.useState)(""),w=(0,c.A)(E,2),Y=w[0],k=w[1],A=(0,o.useState)(""),y=(0,c.A)(A,2),q=y[0],F=y[1],U=(0,o.useState)(!1),V=(0,c.A)(U,2),_=V[0],B=V[1],H=function(){var e=(0,g.ug)()||{};T(e),k(e.nickName||""),F(e.avatarUrl||"")};(0,o.useEffect)(function(){H()},[]);var P=function(){(0,g.iA)((0,t.A)((0,t.A)({},b),{},{nickName:Y,avatarUrl:q})),r().showToast({title:"\u4fee\u6539\u6210\u529f",icon:"success"}),B(!1),H()},C=function(){r().showModal({title:"\u786e\u8ba4\u9000\u51fa",content:"\u9000\u51fa\u540e\u5c06\u6e05\u7a7a\u5f53\u524d\u767b\u5f55\u72b6\u6001\uff0c\u786e\u5b9a\u5417\uff1f",success:function(e){e.confirm&&((0,g.Hf)(),r().switchTab({url:"/pages/index/index"}))}})},D=function(e){F(e.detail.avatarUrl||"")};return(0,j.jsxs)(i.Ss,{className:"theme-".concat(n),style:{minHeight:"100vh"},children:[(0,j.jsx)(h.A,{}),(0,j.jsx)(x.A,{title:"\u8bbe\u7f6e",targetSelector:".page-header.settings-header",showBack:!0}),(0,j.jsx)(i.Ss,{className:"settings-page",children:(0,j.jsxs)(i.Ss,{className:"settings-area",children:[(0,j.jsxs)(i.Ss,{className:"page-header settings-header",style:{paddingTop:"".concat(l.statusBarHeight+12,"px")},children:[(0,j.jsx)(i.Ss,{className:"back-btn",onTap:function(){return r().navigateBack()},children:(0,j.jsx)(i.EY,{className:"back-arrow",children:"\u2190"})}),(0,j.jsx)(i.EY,{className:"page-title",children:"\u8bbe\u7f6e"}),(0,j.jsx)(i.Ss,{className:"header-spacer"})]}),(0,j.jsx)(i.Ss,{className:"settings-user surface-card mt-20",children:(0,j.jsxs)(i.Ss,{className:"flex-between",onTap:function(){return B(!0)},children:[(0,j.jsxs)(i.Ss,{className:"flex-center",children:[b.avatarUrl?(0,j.jsx)(i._V,{className:"settings-avatar",src:b.avatarUrl,mode:"aspectFill"}):(0,j.jsx)(i.Ss,{className:"settings-avatar-placeholder",children:(0,j.jsx)(i._V,{className:"settings-avatar-icon",src:(0,p.uq)("/icon/\u4e2a\u4eba.png"),mode:"aspectFit"})}),(0,j.jsxs)(i.Ss,{className:"settings-meta",children:[(0,j.jsx)(i.EY,{className:"settings-name",children:b.nickName||"\u672a\u767b\u5f55"}),(0,j.jsxs)(i.EY,{className:"settings-id",children:["ID: ",b.openid?b.openid.slice(-8):"---"]})]})]}),(0,j.jsx)(i.EY,{className:"arrow",children:"\u203a"})]})}),(0,j.jsxs)(i.Ss,{className:"settings-section surface-card mt-20",children:[(0,j.jsx)(i.EY,{className:"section-label",children:"\u5916\u89c2"}),(0,j.jsx)(i.Ss,{className:"theme-options",children:N.map(function(e){return(0,j.jsxs)(i.Ss,{className:"theme-option ".concat(s===e.value?"active":""),onTap:function(){return a(e.value)},children:[(0,j.jsx)(i.EY,{className:"theme-option-text",children:e.label}),s===e.value&&(0,j.jsx)(i.Ss,{className:"theme-check"})]},e.value)})}),"auto"===s&&(0,j.jsxs)(i.EY,{className:"theme-hint",children:["\u5f53\u524d\u8ddf\u968f\u7cfb\u7edf\uff1a","dark"===n?"\u6df1\u8272\u6a21\u5f0f":"\u6d45\u8272\u6a21\u5f0f"]})]}),(0,j.jsx)(i.Ss,{className:"settings-list surface-card mt-20",children:v.map(function(e,s){return(0,j.jsxs)(i.Ss,{className:"settings-item ".concat(s<v.length-1?"bordered":""),onTap:function(){return e.action({setShowEdit:B})},children:[(0,j.jsx)(i._V,{className:"settings-item-icon-img",src:e.icon,mode:"aspectFit"}),(0,j.jsx)(i.EY,{className:"settings-item-label",children:e.label}),(0,j.jsx)(i.EY,{className:"arrow",children:"\u203a"})]},s)})}),b&&b.openid&&(0,j.jsx)(i.Ss,{className:"mt-20",children:(0,j.jsx)(i.Ss,{className:"btn-secondary logout-btn",onTap:C,children:(0,j.jsx)(i.EY,{children:"\u9000\u51fa\u767b\u5f55"})})}),(0,j.jsx)(i.Ss,{style:{height:"80rpx"}}),_&&(0,j.jsx)(i.Ss,{className:"modal-overlay",children:(0,j.jsxs)(i.Ss,{className:"modal-card surface-card",children:[(0,j.jsx)(i.EY,{className:"modal-title",children:"\u4fee\u6539\u4fe1\u606f"}),(0,j.jsx)(i.$n,{className:"avatar-btn",openType:"chooseAvatar",onChooseAvatar:D,children:q?(0,j.jsx)(i._V,{className:"avatar-img",src:q,mode:"aspectFill"}):(0,j.jsx)(i._V,{className:"avatar-placeholder-img",src:(0,p.uq)("/icon/\u4e2a\u4eba.png"),mode:"aspectFit"})}),(0,j.jsx)(i.pd,{className:"nickname-input",placeholder:"\u8bf7\u8f93\u5165\u6635\u79f0",value:Y,onInput:function(e){return k(e.detail.value)}}),(0,j.jsxs)(i.Ss,{className:"form-actions",children:[(0,j.jsx)(i.Ss,{className:"btn-secondary",onTap:function(){return B(!1)},children:(0,j.jsx)(i.EY,{children:"\u53d6\u6d88"})}),(0,j.jsx)(i.Ss,{className:"btn-primary",onTap:P,children:(0,j.jsx)(i.EY,{children:"\u4fdd\u5b58"})})]})]})})]})})]})}var S={navigationStyle:"custom",enablePageMeta:!0,navigationBarTitleText:"\u8bbe\u7f6e"};Page((0,n.createPageConfig)(f,"pages/settings/index",{root:{cn:[]}},S||{}))}},function(e){var s=function(s){return e(e.s=s)};e.O(0,[907,96,76],function(){return s(9157)});e.O()}]); |