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
9.6 KiB
JavaScript
1 line
9.6 KiB
JavaScript
"use strict";(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[341],{8985:function(e,a,s){var c=s(5712),n=s(1393),t=s(9346),r=s(1433),i=s(408),d=s(3048),l=s.n(d),o=s(2785),u=s(1679),h=s(2023),m=s(2809),x=s(225),p=s(1986),g=s(1872),f=s(4521),j=s(9093),N=s(2728),S=s(7396),k=s(6517);function v(){var e=(0,p.wR)(),a=(e.theme,e.resolvedTheme),s=(0,g.c)();(0,f.l)(a);var c=(0,o.useState)(null),d=(0,r.A)(c,2),v=d[0],w=d[1],E=(0,o.useState)(null),Y=(0,r.A)(E,2),b=Y[0],y=Y[1],D=(0,o.useState)(!1),T=(0,r.A)(D,2),A=T[0],P=T[1],I=(0,o.useState)([]),B=(0,r.A)(I,2),R=B[0],C=B[1],F=(0,o.useState)(null),_=(0,r.A)(F,2),M=_[0],q=_[1],H=(0,o.useState)(!1),J=(0,r.A)(H,2),O=J[0],V=J[1];(0,o.useEffect)(function(){var e=l().getCurrentInstance().router,a=e?e.params:void 0,s=a?a.designId:void 0;if(s){var c=function(){var e=(0,t.A)((0,n.A)().m(function e(){var a,c,t,r;return(0,n.A)().w(function(e){while(1)switch(e.p=e.n){case 0:return e.p=0,e.n=1,(0,h.hY)(s);case 1:return a=e.v,w(a),e.n=2,(0,m.ls)();case 2:c=e.v,C(c),y(c.find(function(e){return e.isDefault})||c[0]||null),e.n=4;break;case 3:e.p=3,e.v,t=(0,u.p_)(),r=t.find(function(e){return e.id===s}),w(r||null),y((0,u.EB)()),C((0,u.Re)());case 4:return e.a(2)}},e,null,[[0,3]])}));return function(){return e.apply(this,arguments)}}();c()}},[]);var G=function(){var e=(0,t.A)((0,n.A)().m(function e(){return(0,n.A)().w(function(e){while(1)switch(e.n){case 0:if(!O){e.n=1;break}return e.a(2);case 1:if(b){e.n=2;break}return l().showToast({title:"\u8bf7\u5148\u6dfb\u52a0\u6536\u8d27\u5730\u5740",icon:"none"}),e.a(2);case 2:l().showModal({title:"\u786e\u8ba4\u4e0b\u5355",content:"\u786e\u8ba4\u540e\u5c06\u4ece\u8bbe\u8ba1\u6e05\u5355\u751f\u6210\u8ba2\u5355\uff0c\u5e76\u5bc4\u9001\u81f3\uff1a\n".concat(K(b.region,b.detail)),success:function(){var e=(0,t.A)((0,n.A)().m(function e(a){var s,c,t,r,i;return(0,n.A)().w(function(e){while(1)switch(e.p=e.n){case 0:if(!a.confirm){e.n=8;break}if(V(!0),e.p=1,s=v.id,!String(s).startsWith("DSG")){e.n=3;break}return e.n=2,(0,h.x9)({productId:v.productId,productName:v.productName,unitPrice:v.unitPrice,count:v.count,designData:v.designData});case 2:c=e.v,(0,u.Fu)((0,u.p_)().map(function(e){return e.id===v.id?c:e})),w(c),s=c.id;case 3:return e.n=4,(0,x.fS)({designListId:s,addressId:b.id,requestId:"checkout-".concat(s,"-").concat(Date.now()),items:[{productId:v.productId,quantity:v.count}]});case 4:return t=e.v,q(t.totalAmount),e.n=5,(0,x.Tg)(t.id);case 5:r=e.v,r.configured?(l().showToast({title:"\u8ba2\u5355\u5df2\u521b\u5efa",icon:"success"}),l().switchTab({url:"/pages/orders/index"})):l().showModal({title:"\u8ba2\u5355\u5df2\u521b\u5efa",content:"\u5f53\u524d\u6682\u4e0d\u652f\u6301\u5fae\u4fe1\u652f\u4ed8\uff0c\u8ba2\u5355\u5df2\u4fdd\u7559\u5728\u5f85\u4ed8\u6b3e\u3002",showCancel:!1,success:function(){return l().switchTab({url:"/pages/orders/index"})}}),e.n=7;break;case 6:e.p=6,i=e.v,l().showToast({title:i.message||"\u4e0b\u5355\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5",icon:"none"});case 7:return e.p=7,V(!1),e.f(7);case 8:return e.a(2)}},e,null,[[1,6,7,8]])}));function a(a){return e.apply(this,arguments)}return a}()});case 3:return e.a(2)}},e)}));return function(){return e.apply(this,arguments)}}(),L=function(e){y(e),P(!1),l().showToast({title:"\u5730\u5740\u5df2\u66f4\u6539",icon:"success"})},W=v&&v.designData&&v.designData.stickers&&v.designData.stickers.length>0,z=v&&v.designData?v.designData.imageSrc:void 0,K=function(e,a){var s=e?e.join(" "):"";return s?"".concat(s," ").concat(a):a};if(!v)return(0,k.jsxs)(i.Ss,{className:"theme-".concat(a),children:[(0,k.jsx)(j.A,{}),(0,k.jsx)(N.A,{title:"\u8bbe\u8ba1\u6548\u679c\u786e\u8ba4",targetSelector:".page-header",showBack:!0}),(0,k.jsx)(i.Ss,{className:"checkout-page",children:(0,k.jsx)(i.Ss,{className:"page-header",style:{paddingTop:"".concat(s.statusBarHeight+12,"px")},children:(0,k.jsxs)(i.Ss,{className:"page-header-inner",children:[(0,k.jsx)(i.Ss,{className:"back-btn",onTap:function(){return l().navigateBack()},children:(0,k.jsx)(i.EY,{className:"back-arrow",children:"\u2190"})}),(0,k.jsx)(i.EY,{className:"nav-title",children:"\u8bbe\u8ba1\u4e0d\u5b58\u5728"}),(0,k.jsx)(i.Ss,{className:"nav-placeholder"})]})})})]});var Q={width:300,height:420};if(v.designData&&v.designData.category&&v.designData.category.mask){var U=v.designData.category.mask;Q.width=U.width,Q.height=U.height,"circle"===U.shape?Q.borderRadius="50%":Q.borderRadius=U.borderRadius||0}return(0,k.jsxs)(i.Ss,{className:"theme-".concat(a),children:[(0,k.jsx)(j.A,{}),(0,k.jsx)(N.A,{title:"\u8bbe\u8ba1\u6548\u679c\u786e\u8ba4",targetSelector:".page-header",showBack:!0}),(0,k.jsxs)(i.Ss,{className:"checkout-page",children:[(0,k.jsx)(i.Ss,{className:"page-header",style:{paddingTop:"".concat(s.statusBarHeight+12,"px")},children:(0,k.jsxs)(i.Ss,{className:"page-header-inner",children:[(0,k.jsx)(i.Ss,{className:"back-btn",onTap:function(){return l().navigateBack()},children:(0,k.jsx)(i.EY,{className:"back-arrow",children:"\u2190"})}),(0,k.jsx)(i.EY,{className:"nav-title",children:"\u8bbe\u8ba1\u6548\u679c\u786e\u8ba4"}),(0,k.jsx)(i.Ss,{className:"nav-placeholder"})]})}),(0,k.jsx)(i.Ss,{className:"checkout-canvas surface-card",children:(0,k.jsx)(i.Ss,{className:"canvas-area",style:Q,children:W?v.designData.stickers.map(function(e){return(0,k.jsx)(i._V,{className:"checkout-image",src:e.src,style:{transform:"translate(".concat(e.x,"px, ").concat(e.y,"px) scale(").concat(e.scale||1,")"),width:e.width||200,height:e.height||200},mode:"aspectFit"},e.id)}):z?(0,k.jsx)(i._V,{className:"checkout-image",src:v.designData.imageSrc,style:{transform:"translate(".concat(v.designData.imagePos&&v.designData.imagePos.x||0,"px, ").concat(v.designData.imagePos&&v.designData.imagePos.y||0,"px) scale(").concat(v.designData.imagePos&&v.designData.imagePos.scale||1,")")},mode:"aspectFit"}):null})}),(0,k.jsxs)(i.Ss,{className:"checkout-info surface-card",children:[(0,k.jsx)(i.EY,{className:"card-title",children:"\u786e\u8ba4\u5546\u54c1"}),(0,k.jsxs)(i.Ss,{className:"info-row",children:[(0,k.jsx)(i.EY,{className:"info-label",children:"\u5546\u54c1"}),(0,k.jsx)(i.EY,{className:"info-value",children:v.productName})]}),(0,k.jsxs)(i.Ss,{className:"info-row",children:[(0,k.jsx)(i.EY,{className:"info-label",children:"\u6570\u91cf"}),(0,k.jsxs)(i.EY,{className:"info-value",children:[v.count," \u4ef6"]})]}),(0,k.jsxs)(i.Ss,{className:"info-row",children:[(0,k.jsx)(i.EY,{className:"info-label",children:"\u5355\u4ef7"}),(0,k.jsxs)(i.EY,{className:"info-value",children:["\xa5",v.unitPrice]})]}),(0,k.jsxs)(i.Ss,{className:"info-row total-row",children:[(0,k.jsx)(i.EY,{className:"info-label",children:"\u603b\u4ef7"}),(0,k.jsxs)(i.EY,{className:"info-total",children:["\xa5",(null!==M&&void 0!==M?M:v.unitPrice*v.count).toFixed(2)]})]})]}),(0,k.jsxs)(i.Ss,{className:"checkout-address-card surface-card",children:[(0,k.jsxs)(i.Ss,{className:"checkout-address-header",children:[(0,k.jsx)(i.EY,{className:"card-title",children:"\u6536\u8d27\u5730\u5740"}),(0,k.jsx)(i.Ss,{className:"address-change",onTap:function(){return P(!0)},children:(0,k.jsx)(i.EY,{className:"change-text",children:"\u66f4\u6539\u6536\u8d27\u5730\u5740"})})]}),b?(0,k.jsxs)(i.Ss,{className:"checkout-address-body",children:[(0,k.jsxs)(i.Ss,{className:"addr-row",children:[(0,k.jsx)(i.EY,{className:"addr-name",children:b.name}),(0,k.jsx)(i.EY,{className:"addr-phone",children:b.phone})]}),(0,k.jsx)(i.EY,{className:"addr-detail",children:K(b.region,b.detail)})]}):(0,k.jsx)(i.Ss,{className:"checkout-address-empty",onTap:function(){return P(!0)},children:(0,k.jsx)(i.EY,{className:"empty-text",children:"\u6682\u65e0\u6536\u8d27\u5730\u5740\uff0c\u70b9\u51fb\u6dfb\u52a0"})})]}),(0,k.jsxs)(S.A,{children:[(0,k.jsx)(i.Ss,{className:"btn-secondary",onTap:function(){return l().navigateBack()},children:(0,k.jsx)(i.EY,{children:"\u8fd4\u56de\u4fee\u6539"})}),(0,k.jsx)(i.Ss,{className:"btn-primary ".concat(O?"disabled":""),onTap:G,children:(0,k.jsx)(i.EY,{children:O?"\u63d0\u4ea4\u4e2d\u2026":"\u786e\u8ba4\u4e0b\u5355"})})]}),(0,k.jsx)(i.Ss,{className:"safe-bottom-placeholder"}),A&&(0,k.jsx)(i.Ss,{className:"modal-overlay",style:{alignItems:"flex-end",justifyContent:"flex-end"},children:(0,k.jsxs)(i.Ss,{className:"addr-picker-sheet surface-card",children:[(0,k.jsxs)(i.Ss,{className:"addr-picker-header",children:[(0,k.jsx)(i.EY,{className:"addr-picker-title",children:"\u9009\u62e9\u6536\u8d27\u5730\u5740"}),(0,k.jsx)(i.EY,{className:"addr-picker-close",onTap:function(){return P(!1)},children:"\u2715"})]}),(0,k.jsxs)(i.Ss,{className:"addr-picker-list",children:[R.map(function(e){return(0,k.jsxs)(i.Ss,{className:"addr-picker-item ".concat(b&&b.id===e.id?"active":""),onTap:function(){return L(e)},children:[(0,k.jsxs)(i.Ss,{className:"addr-picker-row",children:[(0,k.jsx)(i.EY,{className:"addr-picker-name",children:e.name}),(0,k.jsx)(i.EY,{className:"addr-picker-phone",children:e.phone}),e.isDefault&&(0,k.jsx)(i.EY,{className:"addr-picker-default",children:"\u9ed8\u8ba4"})]}),(0,k.jsx)(i.EY,{className:"addr-picker-detail",children:K(e.region,e.detail)})]},e.id)}),0===R.length&&(0,k.jsx)(i.Ss,{className:"addr-picker-empty",children:(0,k.jsx)(i.EY,{children:"\u6682\u65e0\u5730\u5740\uff0c\u8bf7\u5148\u6dfb\u52a0\u6536\u8d27\u5730\u5740"})})]}),(0,k.jsx)(i.Ss,{className:"addr-picker-add",onTap:function(){P(!1),l().navigateTo({url:"/pages/address/index"})},children:(0,k.jsx)(i.EY,{className:"addr-picker-add-text",children:"+ \u65b0\u5efa\u6536\u8d27\u5730\u5740"})})]})})]})]})}var w={navigationStyle:"custom",enablePageMeta:!0,navigationBarTitleText:"\u786e\u8ba4\u4e0b\u5355"};Page((0,c.createPageConfig)(v,"pages/checkout/index",{root:{cn:[]}},w||{}))}},function(e){var a=function(a){return e(e.s=a)};e.O(0,[907,96,76],function(){return a(8985)});e.O()}]); |