Files
lhmin0604andClaude 3de6128cae restore(r2): 恢复被 R3 整树提交覆盖的 R2 功能层(契约实现为准)
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>
2026-09-15 05:28:50 +08:00

1 line
8.6 KiB
JavaScript

"use strict";(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[402],{1594:function(e,n,s){var a=s(5712),r=s(6004),t=s(1393),c=s(9346),o=s(1433),i=s(408),l=s(3048),d=s.n(l),u=s(2785),p=s(1679),h=s(225),m=s(8723),g=s(7042),x=s(1986),b=s(1872),f=s(4521),j=s(1884),N=s(9093),v=s(2728),S=s(2597),E=s(6517),w=[{code:"all",label:"\u5168\u90e8"},{code:"pending",label:"\u5f85\u4ed8\u6b3e"},{code:"paid",label:"\u5f85\u53d1\u8d27"},{code:"shipping",label:"\u5f85\u6536\u8d27"},{code:"done",label:"\u5df2\u5b8c\u6210"},{code:"expired",label:"\u5df2\u8d85\u65f6"}],y={pending:{label:"\u5f85\u4ed8\u6b3e",badge:"badge-pink"},paid:{label:"\u5f85\u53d1\u8d27",badge:"badge-blue"},shipping:{label:"\u5f85\u6536\u8d27",badge:"badge-blue"},done:{label:"\u5df2\u5b8c\u6210",badge:"badge-green"},cancelled:{label:"\u5df2\u53d6\u6d88",badge:"badge-gray"},expired:{label:"\u8ba2\u5355\u8d85\u65f6\u672a\u652f\u4ed8",badge:"badge-gray"}};function T(){var e=(0,x.wR)(),n=(e.theme,e.resolvedTheme),s=(0,b.c)();(0,f.l)(n);var a=(0,u.useState)("all"),l=(0,o.A)(a,2),T=l[0],A=l[1],Y=(0,u.useState)([]),C=(0,o.A)(Y,2),P=C[0],I=C[1],k=function(e){var n=e.items[0],s="PENDING"===e.status?"pending":"PAID"===e.status||"PROCESSING"===e.status?"paid":"SHIPPED"===e.status?"shipping":"COMPLETED"===e.status?"done":"PAYMENT_EXPIRED"===e.status?"expired":"cancelled";return{id:e.id,productName:(null===n||void 0===n?void 0:n.name)||"\u5b9a\u5236\u5546\u54c1",productIcon:(0,m.QE)({id:null===n||void 0===n?void 0:n.productId}),statusCode:s,date:new Date(e.createdAt).toLocaleString("zh-CN"),price:"\xa5".concat(Number(e.totalAmount).toFixed(2)),count:(null===n||void 0===n?void 0:n.quantity)||0,sku:e.orderNo,paymentExpiresAt:e.paymentExpiresAt}},D=function(){var e=(0,c.A)((0,t.A)().m(function e(){var n;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return e.p=0,e.n=1,(0,h.Gb)({page:1,pageSize:100});case 1:n=e.v,I(n.list.map(k)),e.n=3;break;case 2:e.p=2,e.v,I((0,p.n7)());case 3:return e.a(2)}},e,null,[[0,2]])}));return function(){return e.apply(this,arguments)}}();(0,u.useEffect)(D,[]),(0,u.useEffect)(function(){var e=function(){var e=d().getStorageSync("orders:filter");e&&w.some(function(n){return n.code===e})&&(A(e),d().removeStorageSync("orders:filter")),D()};e();var n=d().getCurrentInstance().page;if(n){var s=n.onShow;n.onShow=function(){e(),s&&s.apply(this)}}},[]),(0,u.useEffect)(function(){return d().eventCenter&&d().eventCenter.once("orders:refresh",D),D(),function(){d().eventCenter&&d().eventCenter.off("orders:refresh",D)}},[]);var F="all"===T?P:P.filter(function(e){return e.statusCode===T}),M=function(e){d().navigateTo({url:"/pages/orderDetail/index?orderId=".concat(e.id)})},B=function(){var e=(0,c.A)((0,t.A)().m(function e(n,s){var a,r;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return s.stopPropagation(),e.p=1,e.n=2,(0,h.Tg)(n.id);case 2:a=e.v,d().showToast({title:a.configured?"\u652f\u4ed8\u51c6\u5907\u4e2d":"\u652f\u4ed8\u672a\u914d\u7f6e",icon:"none"}),e.n=4;break;case 3:e.p=3,r=e.v,d().showToast({title:r.message||"\u652f\u4ed8\u5931\u8d25",icon:"none"});case 4:return e.a(2)}},e,null,[[1,3]])}));return function(n,s){return e.apply(this,arguments)}}(),O=function(){var e=(0,c.A)((0,t.A)().m(function e(n,s){var a;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return s.stopPropagation(),e.p=1,e.n=2,(0,h.N4)(n.id);case 2:return e.n=3,D();case 3:d().showToast({title:"\u8ba2\u5355\u5df2\u53d6\u6d88",icon:"success"}),e.n=5;break;case 4:e.p=4,a=e.v,d().showToast({title:a.message||"\u53d6\u6d88\u5931\u8d25",icon:"none"});case 5:return e.a(2)}},e,null,[[1,4]])}));return function(n,s){return e.apply(this,arguments)}}(),q=function(){var e=(0,c.A)((0,t.A)().m(function e(n,s){var a;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return s.stopPropagation(),e.p=1,e.n=2,(0,h.NQ)(n.id);case 2:return e.n=3,D();case 3:d().showToast({title:"\u5df2\u786e\u8ba4\u6536\u8d27",icon:"success"}),e.n=5;break;case 4:e.p=4,a=e.v,d().showToast({title:a.message||"\u64cd\u4f5c\u5931\u8d25",icon:"none"});case 5:return e.a(2)}},e,null,[[1,4]])}));return function(n,s){return e.apply(this,arguments)}}();return(0,E.jsxs)(i.Ss,{className:"theme-".concat(n),children:[(0,E.jsx)(N.A,{}),(0,E.jsx)(v.A,{title:"\u6211\u7684\u8ba2\u5355",targetSelector:".orders-page .page-header"}),(0,E.jsx)(j.A,{children:(0,E.jsxs)(i.Ss,{className:"orders-page",children:[(0,E.jsx)(i.Ss,{className:"page-header",style:{marginTop:"".concat(s.statusBarHeight+12,"px")},children:(0,E.jsx)(i.EY,{className:"page-title",children:"\u6211\u7684\u8ba2\u5355"})}),(0,E.jsx)(i.Ss,{className:"status-tabs",children:(0,E.jsx)(i.BM,{className:"tabs-scroll",scrollX:!0,children:w.map(function(e){return(0,E.jsxs)(i.Ss,{className:"tab-item ".concat(T===e.code?"active":""),onTap:function(){return A(e.code)},children:[(0,E.jsx)(i.EY,{className:"tab-label",children:e.label}),T===e.code&&(0,E.jsx)(i.Ss,{className:"tab-underline"})]},e.code)})})}),(0,E.jsxs)(i.BM,{className:"orders-list",scrollY:!0,children:[F.map(function(e){var n=y[e.statusCode]||y.pending,s=(e.productIcon||"").startsWith("/icon/")||/^https?:/i.test(e.productIcon||"")?e.productIcon:"/icon/\u56db\u89d2\u661f.svg",a=(0,g.uq)(s);return(0,E.jsxs)(i.Ss,{className:"order-card surface-card",onTap:function(){return M(e)},children:[(0,E.jsxs)(i.Ss,{className:"order-header",children:[(0,E.jsx)(i.EY,{className:"order-date",children:e.date}),(0,E.jsx)(i.EY,{className:"badge ".concat(n.badge),children:n.label})]}),(0,E.jsxs)(i.Ss,{className:"order-body",children:[(0,E.jsx)(i.Ss,{className:"order-icon-wrapper",children:(0,E.jsx)(i._V,{className:"order-icon-img",src:a,mode:"aspectFit"})}),(0,E.jsxs)(i.Ss,{className:"order-info",children:[(0,E.jsx)(i.EY,{className:"order-product",children:e.productName}),(0,E.jsx)(i.EY,{className:"order-sku",children:e.sku}),(0,E.jsxs)(i.EY,{className:"order-meta",children:["\u6570\u91cf: ",e.count," \u4ef6 | ",e.id]}),"pending"===e.statusCode&&(0,E.jsx)(S.A,{className:"order-countdown",deadline:e.paymentExpiresAt,onExpired:function(){return I(function(n){return n.map(function(n){return n.id===e.id?(0,r.A)((0,r.A)({},n),{},{statusCode:"expired"}):n})})}})]})]}),(0,E.jsxs)(i.Ss,{className:"order-footer",children:[(0,E.jsxs)(i.Ss,{className:"order-price-bar",children:[(0,E.jsx)(i.EY,{className:"price-label",children:"\u5b9e\u4ed8\u6b3e"}),(0,E.jsx)(i.EY,{className:"price-value",children:e.price})]}),(0,E.jsxs)(i.Ss,{className:"order-actions",children:["pending"===e.statusCode&&(0,E.jsxs)(E.Fragment,{children:[(0,E.jsx)(i.Ss,{className:"btn-primary order-btn",onTap:function(n){return B(e,n)},children:(0,E.jsx)(i.EY,{children:"\u7acb\u5373\u4ed8\u6b3e"})}),(0,E.jsx)(i.Ss,{className:"btn-secondary order-btn",onTap:function(n){return O(e,n)},children:(0,E.jsx)(i.EY,{children:"\u53d6\u6d88\u8ba2\u5355"})})]}),"paid"===e.statusCode&&(0,E.jsx)(i.Ss,{className:"btn-secondary order-btn",children:(0,E.jsx)(i.EY,{children:"\u50ac\u53d1\u8d27"})}),"shipping"===e.statusCode&&(0,E.jsxs)(E.Fragment,{children:[(0,E.jsx)(i.Ss,{className:"btn-secondary order-btn",onTap:function(e){e.stopPropagation(),d().showToast({title:"\u67e5\u770b\u7269\u6d41",icon:"none"})},children:(0,E.jsx)(i.EY,{children:"\u67e5\u770b\u7269\u6d41"})}),(0,E.jsx)(i.Ss,{className:"btn-primary order-btn",onTap:function(n){return q(e,n)},children:(0,E.jsx)(i.EY,{children:"\u786e\u8ba4\u6536\u8d27"})})]}),"done"===e.statusCode&&(0,E.jsxs)(E.Fragment,{children:[(0,E.jsx)(i.Ss,{className:"btn-secondary order-btn",onTap:function(e){e.stopPropagation(),d().showToast({title:"\u7533\u8bf7\u552e\u540e",icon:"none"})},children:(0,E.jsx)(i.EY,{children:"\u7533\u8bf7\u552e\u540e"})}),(0,E.jsx)(i.Ss,{className:"btn-primary order-btn",onTap:function(e){e.stopPropagation(),d().showToast({title:"\u518d\u6765\u4e00\u5355",icon:"none"})},children:(0,E.jsx)(i.EY,{children:"\u518d\u6765\u4e00\u5355"})})]}),(0,E.jsx)(i.Ss,{className:"btn-secondary order-btn",onTap:function(n){n.stopPropagation(),M(e)},children:(0,E.jsx)(i.EY,{children:"\u8be6\u60c5"})})]})]})]},e.id)}),0===F.length&&(0,E.jsxs)(i.Ss,{className:"empty-state",children:[(0,E.jsx)(i._V,{className:"empty-icon-img",src:(0,g.uq)("/icon/\u5305\u88f9.png"),mode:"aspectFit"}),(0,E.jsx)(i.EY,{className:"empty-text",children:"\u6682\u65e0\u8ba2\u5355"}),(0,E.jsx)(i.EY,{className:"empty-sub",children:"\u53bb\u9996\u9875\u5f00\u59cb\u5b9a\u5236\u5427"}),(0,E.jsx)(i.Ss,{className:"btn-primary",onTap:function(){return d().switchTab({url:"/pages/index/index"})},children:(0,E.jsx)(i.EY,{children:"\u53bb\u5b9a\u5236"})})]})]})]})})]})}var A={navigationStyle:"custom",enablePageMeta:!0,navigationBarTitleText:"\u8ba2\u5355\u5217\u8868"};Page((0,a.createPageConfig)(T,"pages/orders/index",{root:{cn:[]}},A||{}))}},function(e){var n=function(n){return e(e.s=n)};e.O(0,[907,96,76],function(){return n(1594)});e.O()}]);