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([[154],{4736:function(e,s,a){var c=a(5712),n=a(6004),t=a(1393),i=a(9346),r=a(1433),l=a(408),d=a(3048),o=a.n(d),m=a(2785),u=a(1986),h=a(1872),p=a(4521),x=a(9093),j=a(2728),N=a(1679),S=a(225),g=a(8723),E=a(7042),f=a(7396),v=a(2597),Y=a(6517);function w(){var e=(0,u.wR)(),s=(e.theme,e.resolvedTheme),a=(0,h.c)();(0,p.l)(s);var c=o().getCurrentInstance().router,d=c?c.params:{},w=d&&d.orderId||"",k=(0,m.useState)(null),A=(0,r.A)(k,2),T=A[0],C=A[1],b=(0,m.useState)(null),y=(0,r.A)(b,2),I=y[0],P=y[1],B=(0,m.useState)(!1),D=(0,r.A)(B,2),q=D[0],F=D[1],O=(0,m.useState)([]),_=(0,r.A)(O,2),H=_[0];_[1];(0,m.useEffect)(function(){(0,S.iw)(w).then(function(e){var s=e.items[0];C({id:e.id,orderNo:e.orderNo,productId:null===s||void 0===s?void 0:s.productId,productName:(null===s||void 0===s?void 0:s.name)||"\u5b9a\u5236\u5546\u54c1",productIcon:(0,g.QE)({id:null===s||void 0===s?void 0:s.productId}),statusCode:"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",date:new Date(e.createdAt).toLocaleString("zh-CN"),price:"\xa5".concat(Number(e.totalAmount).toFixed(2)),count:(null===s||void 0===s?void 0:s.quantity)||0,sku:e.orderNo,paymentExpiresAt:e.paymentExpiresAt});var a=e.addressSnapshot;P({id:a.id||"",name:a.name,phone:a.phone,region:[a.province,a.city,a.district],detail:a.detail,isDefault:!1})}).catch(function(){var e=(0,N.n7)().find(function(e){return e.id===w});e&&C(e)})},[w]);var M=function(e){F(!1),o().showToast({title:"\u8ba2\u5355\u5730\u5740\u521b\u5efa\u540e\u4e0d\u53ef\u66f4\u6539",icon:"none"})},R=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s,a;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return e.p=0,e.n=1,(0,S.Tg)(w);case 1:s=e.v,o().showToast({title:s.configured?"\u652f\u4ed8\u51c6\u5907\u4e2d":"\u652f\u4ed8\u672a\u914d\u7f6e",icon:"none"}),e.n=3;break;case 2:e.p=2,a=e.v,o().showToast({title:a.message||"\u652f\u4ed8\u5931\u8d25",icon:"none"});case 3:return e.a(2)}},e,null,[[0,2]])}));return function(){return e.apply(this,arguments)}}(),V=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return e.p=0,e.n=1,(0,S.N4)(w);case 1:o().showToast({title:"\u8ba2\u5355\u5df2\u53d6\u6d88",icon:"success"}),setTimeout(function(){return o().navigateBack()},500),e.n=3;break;case 2:e.p=2,s=e.v,o().showToast({title:s.message||"\u53d6\u6d88\u5931\u8d25",icon:"none"});case 3:return e.a(2)}},e,null,[[0,2]])}));return function(){return e.apply(this,arguments)}}(),G=function(){var e=(0,i.A)((0,t.A)().m(function e(){var s;return(0,t.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return e.p=0,e.n=1,(0,S.NQ)(w);case 1:o().showToast({title:"\u5df2\u786e\u8ba4\u6536\u8d27",icon:"success"}),setTimeout(function(){return o().navigateBack()},500),e.n=3;break;case 2:e.p=2,s=e.v,o().showToast({title:s.message||"\u64cd\u4f5c\u5931\u8d25",icon:"none"});case 3:return e.a(2)}},e,null,[[0,2]])}));return function(){return e.apply(this,arguments)}}();return T?(0,Y.jsxs)(l.Ss,{className:"theme-".concat(s),children:[(0,Y.jsx)(x.A,{}),(0,Y.jsx)(j.A,{title:"\u8ba2\u5355\u8be6\u60c5",targetSelector:".page-header",showBack:!0}),(0,Y.jsxs)(l.Ss,{className:"order-detail-page",children:[(0,Y.jsx)(l.Ss,{className:"page-header",style:{paddingTop:"".concat(a.statusBarHeight+12,"px")},children:(0,Y.jsxs)(l.Ss,{className:"page-header-inner",children:[(0,Y.jsx)(l.Ss,{className:"back-btn",onTap:function(){return o().navigateBack()},children:(0,Y.jsx)(l.EY,{className:"back-arrow",children:"\u2190"})}),(0,Y.jsx)(l.EY,{className:"nav-title",children:"\u8ba2\u5355\u8be6\u60c5"}),(0,Y.jsx)(l.Ss,{className:"nav-placeholder"})]})}),(0,Y.jsxs)(l.Ss,{className:"status-banner surface-card",children:[(0,Y.jsxs)(l.EY,{className:"status-text",children:["pending"===T.statusCode&&"\u5f85\u4ed8\u6b3e","paid"===T.statusCode&&"\u5f85\u53d1\u8d27","shipping"===T.statusCode&&"\u5f85\u6536\u8d27","done"===T.statusCode&&"\u5df2\u5b8c\u6210","expired"===T.statusCode&&"\u8ba2\u5355\u8d85\u65f6\u672a\u652f\u4ed8"]}),(0,Y.jsxs)(l.EY,{className:"status-desc",children:["pending"===T.statusCode&&"\u8bf7\u572830\u5206\u949f\u5185\u5b8c\u6210\u652f\u4ed8","paid"===T.statusCode&&"\u5546\u54c1\u6b63\u5728\u6253\u5305\u4e2d\uff0c\u5373\u5c06\u53d1\u8d27","shipping"===T.statusCode&&"\u5feb\u9012\u8fd0\u8f93\u4e2d\uff0c\u8bf7\u6ce8\u610f\u67e5\u6536","done"===T.statusCode&&"\u4ea4\u6613\u5df2\u5b8c\u6210\uff0c\u611f\u8c22\u60e0\u987e","expired"===T.statusCode&&"\u8be5\u8ba2\u5355\u5df2\u8d85\u8fc7 30 \u5206\u949f\u652f\u4ed8\u65f6\u9650"]}),"pending"===T.statusCode&&(0,Y.jsx)(v.A,{className:"payment-countdown",deadline:T.paymentExpiresAt,onExpired:function(){return C(function(e){return e?(0,n.A)((0,n.A)({},e),{},{statusCode:"expired"}):e})}})]}),("shipping"===T.statusCode||"done"===T.statusCode)&&(0,Y.jsxs)(l.Ss,{className:"logistics-card detail-card surface-card",children:[(0,Y.jsxs)(l.Ss,{className:"logistics-header",children:[(0,Y.jsxs)(l.Ss,{className:"flex-center",children:[(0,Y.jsx)(l._V,{className:"card-icon-img",src:(0,E.uq)("/icon/\u5305\u88f9.png"),mode:"aspectFit"}),(0,Y.jsx)(l.EY,{className:"logistics-title",children:"\u7269\u6d41\u4fe1\u606f"})]}),(0,Y.jsx)(l.EY,{className:"logistics-num",children:"\u7269\u6d41\u4fe1\u606f\u5360\u4f4d"})]}),(0,Y.jsxs)(l.Ss,{className:"timeline",children:[(0,Y.jsxs)(l.Ss,{className:"timeline-item active",children:[(0,Y.jsx)(l.Ss,{className:"timeline-dot"}),(0,Y.jsxs)(l.Ss,{className:"timeline-content",children:[(0,Y.jsx)(l.EY,{className:"timeline-status",children:"\u8fd0\u8f93\u4e2d"}),(0,Y.jsx)(l.EY,{className:"timeline-time",children:"\u5f85\u63a5\u5165\u7269\u6d41"}),(0,Y.jsx)(l.EY,{className:"timeline-desc",children:"\u7269\u6d41\u8f68\u8ff9\u5c06\u5728\u53d1\u8d27\u540e\u663e\u793a"})]})]}),(0,Y.jsxs)(l.Ss,{className:"timeline-item",children:[(0,Y.jsx)(l.Ss,{className:"timeline-dot"}),(0,Y.jsxs)(l.Ss,{className:"timeline-content",children:[(0,Y.jsx)(l.EY,{className:"timeline-status",children:"\u5df2\u53d1\u8d27"}),(0,Y.jsx)(l.EY,{className:"timeline-time",children:"\u5f85\u63a5\u5165\u7269\u6d41"}),(0,Y.jsx)(l.EY,{className:"timeline-desc",children:"\u5f53\u524d\u4e3a\u5c55\u793a\u5360\u4f4d"})]})]}),(0,Y.jsxs)(l.Ss,{className:"timeline-item",children:[(0,Y.jsx)(l.Ss,{className:"timeline-dot"}),(0,Y.jsxs)(l.Ss,{className:"timeline-content",children:[(0,Y.jsx)(l.EY,{className:"timeline-status",children:"\u5df2\u4e0b\u5355"}),(0,Y.jsx)(l.EY,{className:"timeline-time",children:"\u8ba2\u5355\u521b\u5efa\u540e\u663e\u793a"}),(0,Y.jsx)(l.EY,{className:"timeline-desc",children:"\u771f\u5b9e\u7269\u6d41\u6570\u636e\u5c1a\u672a\u914d\u7f6e"})]})]})]})]}),(0,Y.jsxs)(l.Ss,{className:"product-card detail-card surface-card",children:[(0,Y.jsxs)(l.Ss,{className:"product-row",children:[(0,Y.jsx)(l.Ss,{className:"product-icon-wrapper",children:(0,Y.jsx)(l._V,{className:"product-icon-img",src:T.productIcon||(0,E.uq)("/icon/\u56db\u89d2\u661f.svg"),mode:"aspectFit"})}),(0,Y.jsxs)(l.Ss,{className:"product-info",children:[(0,Y.jsx)(l.EY,{className:"product-name",children:T.productName}),(0,Y.jsx)(l.EY,{className:"product-sku",children:T.sku})]})]}),(0,Y.jsxs)(l.Ss,{className:"price-row",children:[(0,Y.jsx)(l.EY,{className:"price-label",children:"\u5b9e\u4ed8\u6b3e"}),(0,Y.jsx)(l.EY,{className:"price-value",children:T.price})]})]}),(0,Y.jsxs)(l.Ss,{className:"address-card detail-card surface-card",children:[(0,Y.jsxs)(l.Ss,{className:"address-header",children:[(0,Y.jsxs)(l.Ss,{className:"flex-center",children:[(0,Y.jsx)(l._V,{className:"card-icon-img",src:(0,E.uq)("/icon/\u5730\u5740.png"),mode:"aspectFit"}),(0,Y.jsx)(l.EY,{className:"address-title",children:"\u6536\u8d27\u5730\u5740"})]}),(0,Y.jsx)(l.EY,{className:"change-text",children:"\u4e0b\u5355\u65f6\u5feb\u7167"})]}),I?(0,Y.jsxs)(l.Ss,{className:"address-body",children:[(0,Y.jsxs)(l.Ss,{className:"address-row",children:[(0,Y.jsx)(l.EY,{className:"address-name",children:I.name}),(0,Y.jsx)(l.EY,{className:"address-phone",children:I.phone})]}),(0,Y.jsxs)(l.EY,{className:"address-detail",children:[(I.region||[]).join(" ")," ",I.detail]})]}):(0,Y.jsx)(l.Ss,{className:"address-empty",children:(0,Y.jsx)(l.EY,{children:"\u6682\u65e0\u6536\u8d27\u5730\u5740\uff0c\u8bf7\u5148\u6dfb\u52a0"})})]}),(0,Y.jsxs)(l.Ss,{className:"meta-card detail-card surface-card",children:[(0,Y.jsx)(l.EY,{className:"meta-title",children:"\u8ba2\u5355\u4fe1\u606f"}),(0,Y.jsxs)(l.Ss,{className:"meta-row",children:[(0,Y.jsx)(l.EY,{className:"meta-label",children:"\u8ba2\u5355\u7f16\u53f7"}),(0,Y.jsx)(l.EY,{className:"meta-value",children:T.id})]}),(0,Y.jsxs)(l.Ss,{className:"meta-row",children:[(0,Y.jsx)(l.EY,{className:"meta-label",children:"\u521b\u5efa\u65f6\u95f4"}),(0,Y.jsx)(l.EY,{className:"meta-value",children:T.date})]}),(0,Y.jsxs)(l.Ss,{className:"meta-row",children:[(0,Y.jsx)(l.EY,{className:"meta-label",children:"\u6570\u91cf"}),(0,Y.jsxs)(l.EY,{className:"meta-value",children:[T.count," \u4ef6"]})]})]}),"pending"===T.statusCode&&(0,Y.jsxs)(f.A,{children:[(0,Y.jsx)(l.Ss,{className:"btn-secondary",onTap:V,children:(0,Y.jsx)(l.EY,{children:"\u53d6\u6d88\u8ba2\u5355"})}),(0,Y.jsx)(l.Ss,{className:"btn-primary",onTap:R,children:(0,Y.jsx)(l.EY,{children:"\u652f\u4ed8"})})]}),"shipping"===T.statusCode&&(0,Y.jsx)(f.A,{children:(0,Y.jsx)(l.Ss,{className:"btn-primary",onTap:G,children:(0,Y.jsx)(l.EY,{children:"\u786e\u8ba4\u6536\u8d27"})})}),q&&(0,Y.jsx)(l.Ss,{className:"modal-overlay",style:{alignItems:"flex-end",justifyContent:"flex-end"},children:(0,Y.jsxs)(l.Ss,{className:"addr-picker-sheet surface-card",children:[(0,Y.jsxs)(l.Ss,{className:"addr-picker-header",children:[(0,Y.jsx)(l.EY,{className:"addr-picker-title",children:"\u9009\u62e9\u6536\u8d27\u5730\u5740"}),(0,Y.jsx)(l.EY,{className:"addr-picker-close",onTap:function(){return F(!1)},children:"\u2715"})]}),(0,Y.jsxs)(l.Ss,{className:"addr-picker-list",children:[H.map(function(e){return(0,Y.jsxs)(l.Ss,{className:"addr-picker-item ".concat(I&&I.id===e.id?"active":""),onTap:function(){return M(e)},children:[(0,Y.jsxs)(l.Ss,{className:"addr-picker-row",children:[(0,Y.jsx)(l.EY,{className:"addr-picker-name",children:e.name}),(0,Y.jsx)(l.EY,{className:"addr-picker-phone",children:e.phone}),e.isDefault&&(0,Y.jsx)(l.EY,{className:"addr-picker-default",children:"\u9ed8\u8ba4"})]}),(0,Y.jsxs)(l.EY,{className:"addr-picker-detail",children:[(e.region||[]).join(" ")," ",e.detail]})]},e.id)}),0===H.length&&(0,Y.jsx)(l.Ss,{className:"addr-picker-empty",children:(0,Y.jsx)(l.EY,{children:"\u6682\u65e0\u5730\u5740\uff0c\u8bf7\u5148\u6dfb\u52a0\u6536\u8d27\u5730\u5740"})})]}),(0,Y.jsx)(l.Ss,{className:"addr-picker-add",onTap:function(){F(!1),o().navigateTo({url:"/pages/address/index"})},children:(0,Y.jsx)(l.EY,{className:"addr-picker-add-text",children:"+ \u65b0\u5efa\u6536\u8d27\u5730\u5740"})})]})})]})]}):(0,Y.jsxs)(l.Ss,{className:"theme-".concat(s),children:[(0,Y.jsx)(x.A,{}),(0,Y.jsx)(j.A,{title:"\u8ba2\u5355\u8be6\u60c5",targetSelector:".page-header",showBack:!0}),(0,Y.jsx)(l.Ss,{className:"order-detail-page",children:(0,Y.jsx)(l.Ss,{className:"page-header",style:{paddingTop:"".concat(a.statusBarHeight+12,"px")},children:(0,Y.jsxs)(l.Ss,{className:"page-header-inner",children:[(0,Y.jsx)(l.Ss,{className:"back-btn",onTap:function(){return o().navigateBack()},children:(0,Y.jsx)(l.EY,{className:"back-arrow",children:"\u2190"})}),(0,Y.jsx)(l.EY,{className:"nav-title",children:"\u8ba2\u5355\u4e0d\u5b58\u5728"}),(0,Y.jsx)(l.Ss,{className:"nav-placeholder"})]})})})]})}var k={navigationStyle:"custom",enablePageMeta:!0,navigationBarTitleText:"\u8ba2\u5355\u8be6\u60c5"};Page((0,c.createPageConfig)(w,"pages/orderDetail/index",{root:{cn:[]}},k||{}))}},function(e){var s=function(s){return e(e.s=s)};e.O(0,[907,96,76],function(){return s(4736)});e.O()}]); |