商品浏览页构建前最后一次更新

2026-08-02 00:21:54 +08:00
parent d37a93ab9e
commit e423ab2d73
146 changed files with 3449 additions and 1342 deletions
@@ -273,3 +273,42 @@ page {
 .safe-bottom-placeholder {
  height: 160rpx;
 }
+
+/* ==========================================================
+   底部弹窗遮罩（地址选择器等共用）
+   ========================================================== */
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 600;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-end;
+      -ms-flex-align: end;
+          align-items: flex-end;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+}
+
+.addr-picker-sheet {
+  width: 100%;
+  max-height: 70vh;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 24rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  background: var(--bg-card);
+  border-top: var(--line-card);
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
@@ -82,7 +82,7 @@ var react__WEBPACK_IMPORTED_MODULE_3___namespace_cache;



-var config = {"pages":["pages/index/index","pages/product/index","pages/diy/index","pages/checkout/index","pages/designList/index","pages/orders/index","pages/profile/index","pages/service/index","pages/wordcloud/index","pages/orderDetail/index","pages/address/index","pages/settings/index","pages/agreement/index","pages/userDatabase/index"],"window":{"backgroundTextStyle":"light","navigationStyle":"custom","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/designList/index","text":"设计清单"},{"pagePath":"pages/orders/index","text":"订单"},{"pagePath":"pages/profile/index","text":"我的"}]},"permission":{"scope.writePhotosAlbum":{"desc":"保存词云图片到相册"}}};
+var config = {"pages":["pages/index/index","pages/product/index","pages/diy/index","pages/checkout/index","pages/designList/index","pages/orders/index","pages/profile/index","pages/service/index","pages/wordcloud/index","pages/orderDetail/index","pages/address/index","pages/settings/index","pages/agreement/index","pages/userDatabase/index"],"window":{"backgroundTextStyle":"light","navigationStyle":"custom","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/designList/index","text":"设计清单"},{"pagePath":"pages/orders/index","text":"订单"},{"pagePath":"pages/profile/index","text":"我的"}]}};
 _tarojs_runtime__WEBPACK_IMPORTED_MODULE_5__.window.__taroAppConfig = config
 var inst = App((0,_tarojs_plugin_framework_react_dist_runtime__WEBPACK_IMPORTED_MODULE_6__.createReactApp)(_node_modules_tarojs_taro_loader_lib_entry_cache_js_name_app_app_tsx__WEBPACK_IMPORTED_MODULE_2__["default"], /*#__PURE__*/ (react__WEBPACK_IMPORTED_MODULE_3___namespace_cache || (react__WEBPACK_IMPORTED_MODULE_3___namespace_cache = __webpack_require__.t(react__WEBPACK_IMPORTED_MODULE_3__, 2))), react_dom__WEBPACK_IMPORTED_MODULE_4__["default"], config))

@@ -1 +1 @@
-{"pages":["pages/index/index","pages/product/index","pages/diy/index","pages/checkout/index","pages/designList/index","pages/orders/index","pages/profile/index","pages/service/index","pages/wordcloud/index","pages/orderDetail/index","pages/address/index","pages/settings/index","pages/agreement/index","pages/userDatabase/index"],"window":{"backgroundTextStyle":"light","navigationStyle":"custom","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/designList/index","text":"设计清单"},{"pagePath":"pages/orders/index","text":"订单"},{"pagePath":"pages/profile/index","text":"我的"}]},"permission":{"scope.writePhotosAlbum":{"desc":"保存词云图片到相册"}}}
+{"pages":["pages/index/index","pages/product/index","pages/diy/index","pages/checkout/index","pages/designList/index","pages/orders/index","pages/profile/index","pages/service/index","pages/wordcloud/index","pages/orderDetail/index","pages/address/index","pages/settings/index","pages/agreement/index","pages/userDatabase/index"],"window":{"backgroundTextStyle":"light","navigationStyle":"custom","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/designList/index","text":"设计清单"},{"pagePath":"pages/orders/index","text":"订单"},{"pagePath":"pages/profile/index","text":"我的"}]}}
@@ -20,28 +20,31 @@
 function LoginGuard(props) {
  var user = _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().getStorageSync('smart_user_info');
  if (!(user !== null && user !== void 0 && user.openid)) {
-    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
+    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
      className: "login-guard",
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
-        className: "login-guard-icon",
-        children: "\uD83D\uDD12"
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
-        className: "login-guard-title",
-        children: "\u8BF7\u5148\u767B\u5F55"
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
-        className: "login-guard-desc",
-        children: "\u767B\u5F55\u540E\u67E5\u770B\u60A8\u7684\u4E13\u5C5E\u5185\u5BB9"
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
-        className: "btn-gradient login-guard-btn",
-        onClick: function onClick() {
-          return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
-            url: '/pages/profile/index'
-          });
-        },
-        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
-          children: "\u53BB\u767B\u5F55"
-        })
-      })]
+      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
+        className: "login-guard-inner",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
+          className: "login-guard-icon",
+          children: "\uD83D\uDD12"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
+          className: "login-guard-title",
+          children: "\u8BF7\u5148\u767B\u5F55"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
+          className: "login-guard-desc",
+          children: "\u767B\u5F55\u540E\u67E5\u770B\u60A8\u7684\u4E13\u5C5E\u5185\u5BB9"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
+          className: "btn-gradient login-guard-btn",
+          onTap: function onTap() {
+            return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
+              url: '/pages/profile/index'
+            });
+          },
+          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
+            children: "\u53BB\u767B\u5F55"
+          })
+        })]
+      })
    });
  }
  return props.children;
@@ -78,7 +81,7 @@ function ThemeToggle() {
  }, [toggleTheme]);
  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
    className: "theme-toggle",
-    onClick: handleToggle,
+    onTap: handleToggle,
    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.Text, {
      className: "theme-icon",
      children: theme === 'light' ? '🌙' : '☀️'
@@ -155,7 +158,9 @@ function useThemeContext() {

 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   CATEGORIES: function() { return /* binding */ CATEGORIES; },
-/* harmony export */   getProductById: function() { return /* binding */ getProductById; }
+/* harmony export */   PRODUCT_ICON_MAP: function() { return /* binding */ PRODUCT_ICON_MAP; },
+/* harmony export */   getProductById: function() { return /* binding */ getProductById; },
+/* harmony export */   getProductIconImg: function() { return /* binding */ getProductIconImg; }
 /* harmony export */ });
 /* unused harmony export PRODUCTS */
 /**
@@ -170,6 +175,7 @@ var PRODUCTS = [{
  name: '微雕笔记本（小）',
  desc: '便携随行，记录点滴',
  icon: '📓',
+  iconImg: '/icon/书本.png',
  price: 12,
  leadTime: '3-5个工作日',
  description: '精选优质纸张，封面采用高档PU材质，手感细腻。内页可定制横线、方格或空白三种版式。激光微雕工艺将名字或图案精准刻印在封面，永不褪色。小巧轻便，适合随身携带，无论是课堂笔记还是日常备忘，都是你的专属伴侣。',
@@ -185,6 +191,7 @@ var PRODUCTS = [{
  name: '微雕笔记本（大）',
  desc: '大开本，更多创作空间',
  icon: '📔',
+  iconImg: '/icon/书本_大.png',
  price: 45,
  leadTime: '3-5个工作日',
  description: 'A4尺寸大开本，180°平摊设计，书写更自由。封面可选真皮、仿布纹或磨砂材质，激光微雕区域更大，适合呈现全班名字、团队口号或公司Logo等大篇幅内容。是毕业纪念、企业年会礼品的首选。',
@@ -200,6 +207,7 @@ var PRODUCTS = [{
  name: '铜质杯垫',
  desc: '金属质感，桌面艺术',
  icon: '☕',
+  iconImg: '/icon/杯子.png',
  price: 25,
  leadTime: '5-7个工作日',
  description: '采用优质黄铜材质，表面经拉丝工艺处理，呈现哑光金属质感。背面配有防滑软木垫，保护桌面同时防止滑动。激光微雕可在表面刻印名字、日期或祝福语，是乔迁新居、新婚贺礼的精致之选。',
@@ -214,6 +222,7 @@ var PRODUCTS = [{
  name: '竹制笔盒',
  desc: '自然竹纹，文房雅器',
  icon: '✏️',
+  iconImg: '/icon/笔盒.png',
  price: 75,
  leadTime: '7-10个工作日',
  description: '精选天然楠竹，经多道工序打磨抛光，保留天然竹纹肌理。盒盖采用磁吸开合，内部设有分层隔板。激光微雕在竹面上呈现深浅不一的雕刻效果，融入墨香气质。适合书房案头、书法爱好者的文房伴侣。',
@@ -229,6 +238,7 @@ var PRODUCTS = [{
  name: '书本型灯',
  desc: '温暖光影，点亮心意',
  icon: '💡',
+  iconImg: '/icon/书灯.png',
  price: 45,
  leadTime: '5-7个工作日',
  description: '开合式设计，打开即亮，合拢即灭，如魔法书般充满惊喜。采用LED暖光灯源，光线柔和不刺眼，可持续点亮6-8小时。封面激光微雕可定制文字、图案或照片，让温暖的灯光承载专属记忆。是情侣礼物、毕业礼物的创意之选。',
@@ -253,6 +263,30 @@ var getProductById = function getProductById(id) {
  });
 };

+/**
+ * 产品 ID 到 icon 图片路径的映射
+ * 用于兼容旧数据（旧数据 productIcon 存的是 emoji）
+ */
+var PRODUCT_ICON_MAP = {
+  'notebook-small': '/icon/书本.png',
+  'notebook-large': '/icon/书本_大.png',
+  'coaster': '/icon/杯子.png',
+  'penbox': '/icon/笔盒.png',
+  'booklamp': '/icon/书灯.png'
+};
+
+/**
+ * 获取商品对应的 icon 图片路径
+ * - 新数据：直接返回 product.iconImg
+ * - 旧数据：通过 productId 查映射表
+ * - 兜底：返回四角星
+ */
+function getProductIconImg(product) {
+  if (product !== null && product !== void 0 && product.iconImg) return product.iconImg;
+  if (product !== null && product !== void 0 && product.id) return PRODUCT_ICON_MAP[product.id] || '/icon/四角星.png';
+  return '/icon/四角星.png';
+}
+
 /***/ }),

 /***/ "./src/utils/store.ts":
@@ -270,6 +304,7 @@ var getProductById = function getProductById(id) {
 /* harmony export */   deleteUser: function() { return /* binding */ deleteUser; },
 /* harmony export */   designToOrder: function() { return /* binding */ designToOrder; },
 /* harmony export */   getAddressList: function() { return /* binding */ getAddressList; },
+/* harmony export */   getDefaultAddress: function() { return /* binding */ getDefaultAddress; },
 /* harmony export */   getDesignList: function() { return /* binding */ getDesignList; },
 /* harmony export */   getOrderList: function() { return /* binding */ getOrderList; },
 /* harmony export */   getTheme: function() { return /* binding */ getTheme; },
@@ -283,11 +318,13 @@ var getProductById = function getProductById(id) {
 /* harmony export */   updateDesign: function() { return /* binding */ updateDesign; },
 /* harmony export */   verifyAdminPassword: function() { return /* binding */ verifyAdminPassword; }
 /* harmony export */ });
-/* unused harmony exports getUserInfoRaw, setUserInfoRaw, getUserInfoByOpenid, setOrderList, setAddressList, getDefaultAddress */
-/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js */ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js");
-/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js */ "./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js");
+/* unused harmony exports getUserInfoRaw, setUserInfoRaw, getUserInfoByOpenid, setOrderList, setAddressList */
+/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js */ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js");
+/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js */ "./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "./node_modules/@tarojs/taro/index.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _productConfig__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./productConfig */ "./src/utils/productConfig.ts");
+



@@ -462,17 +499,18 @@ function setDesignList(list) {
 }
 function addDesign(product, count) {
  var list = getDesignList();
+  var iconImg = (product === null || product === void 0 ? void 0 : product.iconImg) || _productConfig__WEBPACK_IMPORTED_MODULE_1__.PRODUCT_ICON_MAP[product === null || product === void 0 ? void 0 : product.id] || '/icon/四角星.png';
  var item = {
    id: 'DSG' + Date.now(),
    productId: product.id,
    productName: product.name,
-    productIcon: product.icon,
+    productIcon: iconImg,
    unitPrice: product.price,
    count: count,
    status: 'undesigned',
    createdAt: new Date().toISOString().slice(0, 10)
  };
-  setDesignList([].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__["default"])(list), [item]));
+  setDesignList([].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(list), [item]));
  return item;
 }
 function updateDesign(id, patch) {
@@ -481,7 +519,7 @@ function updateDesign(id, patch) {
    return d.id === id;
  });
  if (idx === -1) return;
-  list[idx] = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])({}, list[idx]), patch);
+  list[idx] = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])({}, list[idx]), patch);
  setDesignList(list);
 }

@@ -498,16 +536,18 @@ function setOrderList(list) {
  _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().setStorageSync(key('order_list'), list);
 }
 function designToOrder(designId) {
+  var _design$productIcon;
  var dList = getDesignList();
  var oList = getOrderList();
  var design = dList.find(function (d) {
    return d.id === designId;
  });
  if (!design) return null;
+  var iconImg = (_design$productIcon = design.productIcon) !== null && _design$productIcon !== void 0 && _design$productIcon.startsWith('/icon/') ? design.productIcon : _productConfig__WEBPACK_IMPORTED_MODULE_1__.PRODUCT_ICON_MAP[design.productId] || '/icon/四角星.png';
  var order = {
    id: 'ORD' + Date.now().toString().slice(-9),
    productName: design.productName,
-    productIcon: design.productIcon,
+    productIcon: iconImg,
    statusCode: 'pending',
    date: new Date().toLocaleString('zh-CN', {
      month: '2-digit',
@@ -527,7 +567,7 @@ function designToOrder(designId) {
    dList[dIdx].orderId = order.id;
  }
  setDesignList(dList);
-  setOrderList([order].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__["default"])(oList)));
+  setOrderList([order].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(oList)));
  return order;
 }

@@ -558,7 +598,7 @@ function setAddressList(list) {
 }
 function addAddress(addr) {
  var list = getAddressList();
-  var item = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])({}, addr), {}, {
+  var item = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])({}, addr), {}, {
    id: 'ADR' + Date.now()
  });
  // 若设为默认，取消其他默认
@@ -567,7 +607,7 @@ function addAddress(addr) {
      a.isDefault = false;
    });
  }
-  setAddressList([item].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__["default"])(list)));
+  setAddressList([item].concat((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(list)));
  return item;
 }
 function updateAddress(id, patch) {
@@ -579,7 +619,7 @@ function updateAddress(id, patch) {
  if (patch.isDefault) list.forEach(function (a) {
    a.isDefault = false;
  });
-  list[idx] = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__["default"])({}, list[idx]), patch);
+  list[idx] = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])({}, list[idx]), patch);
  setAddressList(list);
 }
 function deleteAddress(id) {
@@ -21,19 +21,19 @@
 var TABS = [{
  pagePath: '/pages/index/index',
  text: '首页',
-  icon: '🏠'
+  icon: '/icon/首页.png'
 }, {
  pagePath: '/pages/designList/index',
  text: '设计清单',
-  icon: '📐'
+  icon: '/icon/调色盘.png'
 }, {
  pagePath: '/pages/orders/index',
  text: '订单',
-  icon: '📦'
+  icon: '/icon/包裹.png'
 }, {
  pagePath: '/pages/profile/index',
  text: '我的',
-  icon: '👤'
+  icon: '/icon/个人.png'
 }];
 function CustomTabBar() {
  var _Taro$getCurrentInsta;
@@ -49,12 +49,13 @@ function CustomTabBar() {
      var isActive = currentPath === tab.pagePath;
      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
        className: "tab-item ".concat(isActive ? 'active' : ''),
-        onClick: function onClick() {
+        onTap: function onTap() {
          return switchTab(tab.pagePath);
        },
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
-          className: "tab-icon",
-          children: tab.icon
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Image, {
+          className: "tab-icon-img ".concat(isActive ? 'active' : ''),
+          src: tab.icon,
+          mode: "aspectFit"
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Text, {
          className: "tab-label",
          children: tab.text
@@ -1 +1 @@
-{"version":3,"file":"custom-tab-bar/index.js","mappings":";;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;AChDA;AACA;AACA;AACA;AACA","sources":["webpack://smart-engraving-miniapp/./src/custom-tab-bar/index.tsx?65a5","webpack://smart-engraving-miniapp/._src_custom-tab-bar_index.tsx"],"sourcesContent":["import { View, Text } from '@tarojs/components';\nimport Taro from '@tarojs/taro';\nimport './index.scss';\nimport { jsx as _jsx, jsxs as _jsxs } from \"react/jsx-runtime\";\nvar TABS = [{\n  pagePath: '/pages/index/index',\n  text: '首页',\n  icon: '🏠'\n}, {\n  pagePath: '/pages/designList/index',\n  text: '设计清单',\n  icon: '📐'\n}, {\n  pagePath: '/pages/orders/index',\n  text: '订单',\n  icon: '📦'\n}, {\n  pagePath: '/pages/profile/index',\n  text: '我的',\n  icon: '👤'\n}];\nexport default function CustomTabBar() {\n  var _Taro$getCurrentInsta;\n  var currentPath = \"/\".concat(((_Taro$getCurrentInsta = Taro.getCurrentInstance().router) === null || _Taro$getCurrentInsta === void 0 ? void 0 : _Taro$getCurrentInsta.path) || 'pages/index/index');\n  var switchTab = function switchTab(url) {\n    Taro.switchTab({\n      url: url\n    });\n  };\n  return /*#__PURE__*/_jsx(View, {\n    className: \"custom-tab-bar\",\n    children: TABS.map(function (tab) {\n      var isActive = currentPath === tab.pagePath;\n      return /*#__PURE__*/_jsxs(View, {\n        className: \"tab-item \".concat(isActive ? 'active' : ''),\n        onClick: function onClick() {\n          return switchTab(tab.pagePath);\n        },\n        children: [/*#__PURE__*/_jsx(Text, {\n          className: \"tab-icon\",\n          children: tab.icon\n        }), /*#__PURE__*/_jsx(Text, {\n          className: \"tab-label\",\n          children: tab.text\n        })]\n      }, tab.pagePath);\n    })\n  });\n}","import { createComponentConfig } from '@tarojs/runtime'\nimport component from \"!!../../node_modules/@tarojs/taro-loader/lib/entry-cache.js?name=custom-tab-bar/index!./index.tsx\"\nvar inst = Component(createComponentConfig(component, 'custom-tab-bar/index'))\n\nexport default component\n"],"names":[],"sourceRoot":""}
+{"version":3,"file":"custom-tab-bar/index.js","mappings":";;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;ACjDA;AACA;AACA;AACA;AACA","sources":["webpack://smart-engraving-miniapp/./src/custom-tab-bar/index.tsx?65a5","webpack://smart-engraving-miniapp/._src_custom-tab-bar_index.tsx"],"sourcesContent":["import { View, Text, Image } from '@tarojs/components';\nimport Taro from '@tarojs/taro';\nimport './index.scss';\nimport { jsx as _jsx, jsxs as _jsxs } from \"react/jsx-runtime\";\nvar TABS = [{\n  pagePath: '/pages/index/index',\n  text: '首页',\n  icon: '/icon/首页.png'\n}, {\n  pagePath: '/pages/designList/index',\n  text: '设计清单',\n  icon: '/icon/调色盘.png'\n}, {\n  pagePath: '/pages/orders/index',\n  text: '订单',\n  icon: '/icon/包裹.png'\n}, {\n  pagePath: '/pages/profile/index',\n  text: '我的',\n  icon: '/icon/个人.png'\n}];\nexport default function CustomTabBar() {\n  var _Taro$getCurrentInsta;\n  var currentPath = \"/\".concat(((_Taro$getCurrentInsta = Taro.getCurrentInstance().router) === null || _Taro$getCurrentInsta === void 0 ? void 0 : _Taro$getCurrentInsta.path) || 'pages/index/index');\n  var switchTab = function switchTab(url) {\n    Taro.switchTab({\n      url: url\n    });\n  };\n  return /*#__PURE__*/_jsx(View, {\n    className: \"custom-tab-bar\",\n    children: TABS.map(function (tab) {\n      var isActive = currentPath === tab.pagePath;\n      return /*#__PURE__*/_jsxs(View, {\n        className: \"tab-item \".concat(isActive ? 'active' : ''),\n        onTap: function onTap() {\n          return switchTab(tab.pagePath);\n        },\n        children: [/*#__PURE__*/_jsx(Image, {\n          className: \"tab-icon-img \".concat(isActive ? 'active' : ''),\n          src: tab.icon,\n          mode: \"aspectFit\"\n        }), /*#__PURE__*/_jsx(Text, {\n          className: \"tab-label\",\n          children: tab.text\n        })]\n      }, tab.pagePath);\n    })\n  });\n}","import { createComponentConfig } from '@tarojs/runtime'\nimport component from \"!!../../node_modules/@tarojs/taro-loader/lib/entry-cache.js?name=custom-tab-bar/index!./index.tsx\"\nvar inst = Component(createComponentConfig(component, 'custom-tab-bar/index'))\n\nexport default component\n"],"names":[],"sourceRoot":""}
@@ -40,19 +40,22 @@
  position: relative;
 }

-.tab-icon {
-  font-size: 40rpx;
+.tab-icon-img {
+  width: 28rpx;
+  height: 28rpx;
  margin-bottom: 4rpx;
  -webkit-transition: -webkit-transform 0.2s;
  transition: -webkit-transform 0.2s;
  transition: transform 0.2s;
  transition: transform 0.2s, -webkit-transform 0.2s;
+  opacity: 0.6;
 }

-.tab-item.active .tab-icon {
+.tab-item.active .tab-icon-img {
  -webkit-transform: scale(1.15);
      -ms-transform: scale(1.15);
          transform: scale(1.15);
+  opacity: 1;
 }

 .tab-label {
@@ -154,7 +154,7 @@ function AddressPage() {
          },
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            className: "back-btn",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
            },
            children: "\u2190"
@@ -196,19 +196,19 @@ function AddressPage() {
              className: "address-actions",
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "address-act",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return openEdit(item);
                },
                children: "\u270F\uFE0F \u7F16\u8F91"
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "address-act",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return handleCopy(item);
                },
                children: "\uD83D\uDCCB \u590D\u5236"
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "address-act delete",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return handleDelete(item.id);
                },
                children: "\uD83D\uDDD1\uFE0F \u5220\u9664"
@@ -217,9 +217,10 @@ function AddressPage() {
          }, item.id);
        }), list.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "empty-state",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "empty-icon",
-            children: "\uD83D\uDCCD"
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+            className: "empty-icon-img",
+            src: "/icon/\u5730\u5740.png",
+            mode: "aspectFit"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            className: "empty-text",
            children: "\u8FD8\u6CA1\u6709\u6536\u8D27\u5730\u5740"
@@ -234,7 +235,7 @@ function AddressPage() {
        className: "action-bar",
        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "btn-gradient",
-          onClick: openAdd,
+          onTap: openAdd,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            children: "\u65B0\u589E\u6536\u8D27\u5730\u5740"
          })
@@ -283,7 +284,7 @@ function AddressPage() {
            }
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "form-row",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return setIsDefault(!isDefault);
            },
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -296,7 +297,7 @@ function AddressPage() {
            className: "form-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-outline",
-              onClick: function onClick() {
+              onTap: function onTap() {
                setShowForm(false);
                resetForm();
              },
@@ -305,7 +306,7 @@ function AddressPage() {
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-gradient",
-              onClick: handleSave,
+              onTap: handleSave,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                children: "\u4FDD\u5B58"
              })
@@ -177,8 +177,8 @@
  text-align: center;
 }

-/* 空状态统一的在 app.scss */
-.login-guard {
+/* 空状态（主题适配） */
+.empty-state {
  display: -webkit-flex;
  display: -ms-flexbox;
  display: flex;
@@ -188,30 +188,24 @@
  -webkit-align-items: center;
      -ms-flex-align: center;
          align-items: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
  padding: 120rpx 40rpx;
+  text-align: center;
 }

-.login-guard-icon {
-  font-size: 80rpx;
+.empty-icon-img {
+  width: 48rpx;
+  height: 48rpx;
  margin-bottom: 24rpx;
 }

-.login-guard-title {
-  font-size: 36rpx;
+.empty-text {
+  font-size: 32rpx;
  font-weight: 700;
  color: var(--text-primary);
  margin-bottom: 12rpx;
 }

-.login-guard-desc {
-  font-size: 28rpx;
+.empty-sub {
+  font-size: 26rpx;
  color: var(--text-secondary);
-  margin-bottom: 32rpx;
-}
-
-.login-guard-btn {
-  padding: 20rpx 48rpx;
 }
@@ -29,13 +29,25 @@


 function CheckoutPage() {
-  var _design$designData, _design$designData2, _design$designData3, _design$designData$im, _design$designData$im2, _design$designData$im3;
+  var _design$designData, _design$designData2, _design$designData3, _design$designData$im, _design$designData$im2, _design$designData$im3, _address$region2;
  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__.useThemeContext)(),
    theme = _useThemeContext.theme;
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
    _useState2 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState, 2),
    design = _useState2[0],
    setDesign = _useState2[1];
+  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
+    _useState4 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState3, 2),
+    address = _useState4[0],
+    setAddress = _useState4[1];
+  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
+    _useState6 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState5, 2),
+    showAddrPicker = _useState6[0],
+    setShowAddrPicker = _useState6[1];
+  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)([]),
+    _useState8 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState7, 2),
+    addrList = _useState8[0],
+    setAddrList = _useState8[1];
  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
    var _Taro$getCurrentInsta;
    var params = (_Taro$getCurrentInsta = _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().getCurrentInstance().router) === null || _Taro$getCurrentInsta === void 0 ? void 0 : _Taro$getCurrentInsta.params;
@@ -46,7 +58,47 @@ function CheckoutPage() {
      return x.id === dId;
    });
    setDesign(d || null);
+    setAddress((0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.getDefaultAddress)());
+    setAddrList((0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.getAddressList)());
  }, []);
+  var handleConfirm = function handleConfirm() {
+    var _address$region;
+    if (!address) {
+      _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+        title: '请先添加收货地址',
+        icon: 'none'
+      });
+      return;
+    }
+    _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showModal({
+      title: '确认下单',
+      content: "\u786E\u8BA4\u540E\u5C06\u4ECE\u8BBE\u8BA1\u6E05\u5355\u751F\u6210\u8BA2\u5355\uFF0C\u5E76\u5BC4\u9001\u81F3\uFF1A\n".concat((_address$region = address.region) === null || _address$region === void 0 ? void 0 : _address$region.join(' '), " ").concat(address.detail),
+      success: function success(res) {
+        if (res.confirm) {
+          (0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.designToOrder)(design.id);
+          _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+            title: '下单成功',
+            icon: 'success'
+          });
+          setTimeout(function () {
+            _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
+              url: '/pages/index/index'
+            });
+          }, 1500);
+        }
+      }
+    });
+  };
+  var handlePickAddress = function handlePickAddress(addr) {
+    setAddress(addr);
+    setShowAddrPicker(false);
+    _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+      title: '地址已更改',
+      icon: 'success'
+    });
+  };
+  var hasStickers = (design === null || design === void 0 || (_design$designData = design.designData) === null || _design$designData === void 0 ? void 0 : _design$designData.stickers) && design.designData.stickers.length > 0;
+  var hasLegacyImage = design === null || design === void 0 || (_design$designData2 = design.designData) === null || _design$designData2 === void 0 ? void 0 : _design$designData2.imageSrc;
  if (!design) {
    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
      className: "theme-".concat(theme),
@@ -65,35 +117,13 @@ function CheckoutPage() {
  var maskStyle = {
    width: 300,
    height: 420
-  }; // fallback
-  if ((_design$designData = design.designData) !== null && _design$designData !== void 0 && (_design$designData = _design$designData.category) !== null && _design$designData !== void 0 && _design$designData.mask) {
+  };
+  if ((_design$designData3 = design.designData) !== null && _design$designData3 !== void 0 && (_design$designData3 = _design$designData3.category) !== null && _design$designData3 !== void 0 && _design$designData3.mask) {
    var m = design.designData.category.mask;
    maskStyle.width = m.width;
    maskStyle.height = m.height;
    if (m.shape === 'circle') maskStyle.borderRadius = '50%';else maskStyle.borderRadius = m.borderRadius || 0;
  }
-  var handleConfirm = function handleConfirm() {
-    _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showModal({
-      title: '确认下单',
-      content: '确认后将从设计清单生成订单',
-      success: function success(res) {
-        if (res.confirm) {
-          (0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.designToOrder)(design.id);
-          _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
-            title: '下单成功',
-            icon: 'success'
-          });
-          setTimeout(function () {
-            _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
-              url: '/pages/index/index'
-            });
-          }, 1500);
-        }
-      }
-    });
-  };
-  var hasStickers = ((_design$designData2 = design.designData) === null || _design$designData2 === void 0 ? void 0 : _design$designData2.stickers) && design.designData.stickers.length > 0;
-  var hasLegacyImage = (_design$designData3 = design.designData) === null || _design$designData3 === void 0 ? void 0 : _design$designData3.imageSrc;
  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
    className: "theme-".concat(theme),
    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
@@ -109,7 +139,7 @@ function CheckoutPage() {
          },
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            className: "back-btn",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
            },
            children: "\u2190"
@@ -190,11 +220,55 @@ function CheckoutPage() {
            children: ["\xA5", (design.unitPrice * design.count).toFixed(2)]
          })]
        })]
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        className: "checkout-address-card dashed-card mt-20",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          className: "star-badge"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          className: "checkout-address-header",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+            className: "info-label",
+            children: "\u6536\u8D27\u5730\u5740"
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            className: "address-change",
+            onTap: function onTap() {
+              return setShowAddrPicker(true);
+            },
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "change-text",
+              children: "\u66F4\u6539\u6536\u8D27\u5730\u5740"
+            })
+          })]
+        }), address ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          className: "checkout-address-body",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            className: "addr-row",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "addr-name",
+              children: address.name
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "addr-phone",
+              children: address.phone
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+            className: "addr-detail",
+            children: [(_address$region2 = address.region) === null || _address$region2 === void 0 ? void 0 : _address$region2.join(' '), " ", address.detail]
+          })]
+        }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          className: "checkout-address-empty",
+          onTap: function onTap() {
+            return setShowAddrPicker(true);
+          },
+          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+            className: "empty-text",
+            children: "\u6682\u65E0\u6536\u8D27\u5730\u5740\uFF0C\u70B9\u51FB\u6DFB\u52A0"
+          })
+        })]
      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
        className: "checkout-actions",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "btn-outline",
-          onClick: function onClick() {
+          onTap: function onTap() {
            return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
          },
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -202,7 +276,7 @@ function CheckoutPage() {
          })
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "btn-gradient",
-          onClick: handleConfirm,
+          onTap: handleConfirm,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            children: "\u786E\u8BA4\u4E0B\u5355"
          })
@@ -211,6 +285,72 @@ function CheckoutPage() {
        style: {
          height: '40px'
        }
+      }), showAddrPicker && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        className: "modal-overlay",
+        style: {
+          alignItems: 'flex-end',
+          justifyContent: 'flex-end'
+        },
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          className: "addr-picker-sheet dashed-card",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            className: "addr-picker-header",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "addr-picker-title",
+              children: "\u9009\u62E9\u6536\u8D27\u5730\u5740"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "addr-picker-close",
+              onTap: function onTap() {
+                return setShowAddrPicker(false);
+              },
+              children: "\u2715"
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            className: "addr-picker-list",
+            children: [addrList.map(function (addr) {
+              var _addr$region;
+              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                className: "addr-picker-item ".concat((address === null || address === void 0 ? void 0 : address.id) === addr.id ? 'active' : ''),
+                onTap: function onTap() {
+                  return handlePickAddress(addr);
+                },
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                  className: "addr-picker-row",
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "addr-picker-name",
+                    children: addr.name
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "addr-picker-phone",
+                    children: addr.phone
+                  }), addr.isDefault && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "addr-picker-default",
+                    children: "\u9ED8\u8BA4"
+                  })]
+                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                  className: "addr-picker-detail",
+                  children: [(_addr$region = addr.region) === null || _addr$region === void 0 ? void 0 : _addr$region.join(' '), " ", addr.detail]
+                })]
+              }, addr.id);
+            }), addrList.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+              className: "addr-picker-empty",
+              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                children: "\u6682\u65E0\u5730\u5740\uFF0C\u8BF7\u5148\u6DFB\u52A0\u6536\u8D27\u5730\u5740"
+              })
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            className: "addr-picker-add",
+            onTap: function onTap() {
+              setShowAddrPicker(false);
+              _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
+                url: '/pages/address/index'
+              });
+            },
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              className: "addr-picker-add-text",
+              children: "+ \u65B0\u5EFA\u6536\u8D27\u5730\u5740"
+            })
+          })]
+        })
      })]
    })
  });
@@ -85,6 +85,175 @@
  color: var(--accent-pink);
 }

+/* 地址卡片 */
+.checkout-address-card {
+  padding: 24rpx;
+}
+
+.checkout-address-header {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  margin-bottom: 16rpx;
+}
+
+.address-change {
+  padding: 6rpx 16rpx;
+  border-radius: 8rpx;
+  background: rgba(91, 140, 255, 0.08);
+}
+
+.change-text {
+  font-size: 24rpx;
+  color: var(--accent-blue);
+}
+
+.checkout-address-body {
+  padding-top: 8rpx;
+}
+
+.addr-row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  gap: 16rpx;
+  margin-bottom: 8rpx;
+}
+
+.addr-name {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.addr-phone {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.addr-detail {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+  line-height: 1.5;
+}
+
+.checkout-address-empty {
+  padding: 32rpx 0;
+  text-align: center;
+}
+
+.empty-text {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+/* 底部弹窗 — 地址选择（样式复用 app.scss 全局定义，移除非必要覆写） */
+.addr-picker-header {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.addr-picker-title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.addr-picker-close {
+  font-size: 28rpx;
+  color: var(--text-secondary);
+  padding: 8rpx;
+}
+
+.addr-picker-list {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  overflow-y: auto;
+}
+
+.addr-picker-item {
+  padding: 20rpx 16rpx;
+  border-bottom: 1rpx dashed rgba(0, 0, 0, 0.05);
+}
+
+.addr-picker-item.active {
+  background: rgba(91, 140, 255, 0.06);
+  border-radius: 12rpx;
+}
+
+.addr-picker-row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  gap: 16rpx;
+  margin-bottom: 8rpx;
+}
+
+.addr-picker-name {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.addr-picker-phone {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.addr-picker-default {
+  font-size: 22rpx;
+  color: var(--accent-pink);
+  border: 1rpx solid var(--accent-pink);
+  padding: 2rpx 8rpx;
+  border-radius: 6rpx;
+}
+
+.addr-picker-detail {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.addr-picker-empty {
+  padding: 40rpx;
+  text-align: center;
+  color: var(--text-secondary);
+  font-size: 28rpx;
+}
+
+.addr-picker-add {
+  margin-top: 16rpx;
+  padding: 20rpx;
+  text-align: center;
+  border: 2rpx dashed var(--accent-blue);
+  border-radius: 12rpx;
+}
+
+.addr-picker-add-text {
+  font-size: 28rpx;
+  color: var(--accent-blue);
+}
+
 /* 底部操作 */
 .checkout-actions {
  position: fixed;
@@ -10,16 +10,18 @@
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ DesignListPage; }
 /* harmony export */ });
-/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
+/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "./node_modules/@tarojs/taro/index.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "./node_modules/react/cjs/react.production.min.js");
 /* harmony import */ var _utils_store__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../utils/store */ "./src/utils/store.ts");
-/* harmony import */ var _components_ThemeToggle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../components/ThemeToggle */ "./src/components/ThemeToggle/index.tsx");
-/* harmony import */ var _context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../context/ThemeContext */ "./src/context/ThemeContext.tsx");
-/* harmony import */ var _components_LoginGuard__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../components/LoginGuard */ "./src/components/LoginGuard/index.tsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/cjs/react-jsx-runtime.production.min.js");
+/* harmony import */ var _utils_productConfig__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../utils/productConfig */ "./src/utils/productConfig.ts");
+/* harmony import */ var _components_ThemeToggle__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../components/ThemeToggle */ "./src/components/ThemeToggle/index.tsx");
+/* harmony import */ var _context_ThemeContext__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../context/ThemeContext */ "./src/context/ThemeContext.tsx");
+/* harmony import */ var _components_LoginGuard__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../components/LoginGuard */ "./src/components/LoginGuard/index.tsx");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/cjs/react-jsx-runtime.production.min.js");
+



@@ -61,14 +63,14 @@ var STATUS_STYLE = {
  }
 };
 function DesignListPage() {
-  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__.useThemeContext)(),
+  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_5__.useThemeContext)(),
    theme = _useThemeContext.theme;
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)('all'),
-    _useState2 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_7__["default"])(_useState, 2),
+    _useState2 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_8__["default"])(_useState, 2),
    activeTab = _useState2[0],
    setActiveTab = _useState2[1];
  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)([]),
-    _useState4 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_7__["default"])(_useState3, 2),
+    _useState4 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_8__["default"])(_useState3, 2),
    list = _useState4[0],
    setList = _useState4[1];
  var load = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(function () {
@@ -116,119 +118,123 @@ function DesignListPage() {
      url: "/pages/diy/index?source=designList&designId=".concat(item.id)
    });
  };
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
    className: "theme-".concat(theme),
-    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_LoginGuard__WEBPACK_IMPORTED_MODULE_5__["default"], {
-      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_components_LoginGuard__WEBPACK_IMPORTED_MODULE_6__["default"], {
+      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
        className: "design-page",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_4__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
          className: "page-header dashed-card mt-20",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
            className: "star-badge"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
            className: "page-title",
            children: "\u6211\u7684\u8BBE\u8BA1\u6E05\u5355"
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
          className: "status-tabs",
-          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.ScrollView, {
+          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.ScrollView, {
            className: "tabs-scroll",
            scrollX: true,
            children: STATUS_TABS.map(function (tab) {
-              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                className: "tab-item ".concat(activeTab === tab.code ? 'active' : ''),
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return setActiveTab(tab.code);
                },
-                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                  className: "tab-label",
                  children: tab.label
-                }), activeTab === tab.code && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                }), activeTab === tab.code && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                  className: "tab-underline"
                })]
              }, tab.code);
            })
          })
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.ScrollView, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.ScrollView, {
          className: "design-list",
          scrollY: true,
          children: [filtered.map(function (item) {
+            var _item$productIcon;
            var style = STATUS_STYLE[item.status];
-            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            var iconSrc = (_item$productIcon = item.productIcon) !== null && _item$productIcon !== void 0 && _item$productIcon.startsWith('/icon/') ? item.productIcon : _utils_productConfig__WEBPACK_IMPORTED_MODULE_3__.PRODUCT_ICON_MAP[item.productId] || '/icon/四角星.png';
+            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
              className: "design-card dashed-card",
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                className: "star-badge"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                className: "design-body",
-                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-                  className: "design-icon",
-                  children: item.productIcon
-                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Image, {
+                  className: "design-icon-img",
+                  src: iconSrc,
+                  mode: "aspectFit"
+                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                  className: "design-info",
-                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                    className: "design-title-row",
-                    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                      className: "design-name",
                      children: item.productName
-                    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                      className: "badge ".concat(style.cls),
                      children: style.label
                    })]
-                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                    className: "design-meta",
                    children: ["\u6570\u91CF: ", item.count, " \u4EF6 | \u5355\u4EF7: \xA5", item.unitPrice]
-                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                    className: "design-total",
                    children: ["\u5C0F\u8BA1: \xA5", (item.unitPrice * item.count).toFixed(2)]
                  })]
                })]
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                className: "design-actions",
-                children: [item.status !== 'ordered' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                children: [item.status !== 'ordered' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                  className: "btn-gradient design-btn",
-                  onClick: function onClick() {
+                  onTap: function onTap() {
                    return goDesign(item);
                  },
-                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                    children: item.status === 'undesigned' ? '开始设计' : '继续设计'
                  })
-                }), item.status === 'ordered' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                }), item.status === 'ordered' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
                  className: "btn-outline design-btn",
-                  onClick: function onClick() {
+                  onTap: function onTap() {
                    return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
                      url: '/pages/orders/index'
                    });
                  },
-                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                    children: "\u67E5\u770B\u8BA2\u5355"
                  })
                })]
              })]
            }, item.id);
-          }), filtered.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          }), filtered.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
            className: "empty-state",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-              className: "empty-icon",
-              children: "\uD83D\uDCD0"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Image, {
+              className: "empty-icon-img",
+              src: "/icon/\u8C03\u8272\u76D8.png",
+              mode: "aspectFit"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
              className: "empty-text",
              children: "\u8FD8\u6CA1\u6709\u8BBE\u8BA1\u6E05\u5355"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
              className: "empty-sub",
              children: "\u53BB\u9996\u9875\u901B\u901B\uFF0C\u627E\u5230\u559C\u6B22\u7684\u5B9A\u5236\u54C1"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
              className: "btn-gradient",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
                  url: '/pages/index/index'
                });
              },
-              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.Text, {
                children: "\u53BB\u901B\u901B"
              })
            })]
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_9__.View, {
          style: {
            height: '40px'
          }
@@ -73,6 +73,14 @@
          flex-shrink: 0;
 }

+.design-icon-img {
+  width: 56rpx;
+  height: 56rpx;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
+}
+
 .design-info {
  -webkit-flex: 1;
      -ms-flex: 1;
@@ -140,8 +148,9 @@
  text-align: center;
 }

-.empty-icon {
-  font-size: 80rpx;
+.empty-icon-img {
+  width: 56rpx;
+  height: 56rpx;
  margin-bottom: 24rpx;
 }

@@ -351,7 +351,7 @@ function DIYPage() {
          },
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
            className: "back-btn",
-            onClick: goBack,
+            onTap: goBack,
            children: "\u2190"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
            className: "page-title",
@@ -385,7 +385,7 @@ function DIYPage() {
              },
              onTouchMove: handleStickerTouchMove,
              onTouchEnd: handleTouchEnd,
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setActiveStickerId(s.id);
              },
              mode: "aspectFit"
@@ -411,12 +411,12 @@ function DIYPage() {
                src: s.src,
                className: "sticker-thumb-img",
                mode: "aspectFit",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return setActiveStickerId(s.id);
                }
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
                className: "sticker-del",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return deleteSticker(s.id);
                },
                children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
@@ -427,7 +427,7 @@ function DIYPage() {
            }, s.id);
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
            className: "sticker-add-btn",
-            onClick: addSticker,
+            onTap: addSticker,
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
              className: "add-icon",
              children: "+"
@@ -456,7 +456,7 @@ function DIYPage() {
            },
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
              className: "tool-btn",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return handleScale(activeStickerId, -0.1);
              },
              children: "\uFF0D"
@@ -467,7 +467,7 @@ function DIYPage() {
              })) === null || _stickers$find === void 0 ? void 0 : _stickers$find.scale) || 1) * 100), "%"]
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
              className: "tool-btn",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return handleScale(activeStickerId, 0.1);
              },
              children: "\uFF0B"
@@ -487,7 +487,7 @@ function DIYPage() {
        className: "action-btns mt-20",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
          className: "btn-gradient",
-          onClick: function onClick() {
+          onTap: function onTap() {
            return setPreviewMode(true);
          },
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
@@ -495,7 +495,7 @@ function DIYPage() {
          })
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
          className: "btn-outline",
-          onClick: addSticker,
+          onTap: addSticker,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
            children: "\u6DFB\u52A0\u8D34\u7EB8"
          })
@@ -540,7 +540,7 @@ function DIYPage() {
            className: "preview-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
              className: "btn-outline",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setPreviewMode(false);
              },
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
@@ -548,7 +548,7 @@ function DIYPage() {
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
              className: "btn-gradient ".concat(hasOverlap ? 'disabled' : ''),
-              onClick: handleComplete,
+              onTap: handleComplete,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
                children: "\u786E\u8BA4\u5B8C\u6210"
              })
@@ -28,33 +28,42 @@



-// 成品展示数据
+// 成品展示配图（从 img 里取对应实物图）

-var SHOWCASES = [{
+var SHOWCASE_LIST = [{
  title: '毕业纪念笔记本',
  desc: '全班名字组成校徽',
-  color: '#FFE4EC'
+  image: '/img/book_small/The1.jpg'
 }, {
  title: '铜质杯垫',
  desc: '金属质感桌面艺术',
-  color: '#E8D5C4'
+  image: '/img/cup/The1.jpg'
 }, {
  title: '竹制笔盒',
  desc: '自然竹纹文房雅器',
-  color: '#E0F0D9'
+  image: '/img/penbox/The1.jpg'
 }, {
  title: '书本型灯',
  desc: '温暖光影点亮心意',
-  color: '#FFF3CD'
+  image: '/img/booklight/The1.jpg'
 }, {
  title: '情侣定制礼',
  desc: '两个人的名字交织',
-  color: '#FCE4EC'
+  image: '/img/book_big/The1.jpg'
 }, {
  title: '企业年会礼',
  desc: '员工名字组成Logo',
-  color: '#E3F2FD'
+  image: '/img/penbox/The2.jpg'
 }];
+
+// 品类对应的实物照片映射（首页卡片顶部大图）
+var PRODUCT_IMG_MAP = {
+  'notebook-small': '/img/book_small/The1.jpg',
+  'notebook-large': '/img/book_big/The1.jpg',
+  'coaster': '/img/cup/The1.jpg',
+  'penbox': '/img/penbox/The1.jpg',
+  'booklamp': '/img/booklight/The1.jpg'
+};
 function Index() {
  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__.useThemeContext)(),
    theme = _useThemeContext.theme;
@@ -89,9 +98,10 @@ function Index() {
          className: "star-badge"
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "search-inner",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "search-icon",
-            children: "\uD83D\uDD0D"
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+            className: "search-icon-img",
+            src: "/icon/\u641C\u7D22.png",
+            mode: "aspectFit"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Input, {
            className: "search-input",
            type: "text",
@@ -123,7 +133,7 @@ function Index() {
          previousMargin: "40rpx",
          nextMargin: "40rpx",
          indicatorDots: true,
-          children: SHOWCASES.map(function (item, idx) {
+          children: SHOWCASE_LIST.map(function (item, idx) {
            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.SwiperItem, {
              className: "showcase-swiper-item",
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
@@ -132,25 +142,26 @@ function Index() {
                  className: "star-badge"
                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
                  className: "showcase-image-wrapper",
-                  style: {
-                    background: item.color
-                  },
-                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                    className: "showcase-emoji",
-                    children: "\uD83C\uDF81"
+                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                    className: "showcase-real-img",
+                    src: item.image,
+                    mode: "aspectFill"
                  })
                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-                  className: "showcase-info",
-                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                    className: "showcase-title",
-                    children: item.title
-                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                    className: "showcase-desc",
-                    children: item.desc
+                  className: "showcase-text-area",
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                    className: "showcase-info",
+                    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                      className: "showcase-title",
+                      children: item.title
+                    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                      className: "showcase-desc",
+                      children: item.desc
+                    })]
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                    className: "showcase-tag",
+                    children: "\u6210\u54C1\u6848\u4F8B"
                  })]
-                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-                  className: "showcase-tag",
-                  children: "\u6210\u54C1\u6848\u4F8B"
                })]
              })
            }, idx);
@@ -166,18 +177,18 @@ function Index() {
          children: filteredCategories.map(function (cat) {
            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "category-item dashed-card",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return navigateToProduct(cat.id);
              },
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
                className: "star-badge"
-              }), cat.images && cat.images.length > 0 ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
-                className: "category-icon-img",
-                src: cat.images[0],
-                mode: "aspectFit"
-              }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "category-icon",
-                children: cat.icon
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                className: "category-img-wrapper",
+                children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                  className: "category-img-real",
+                  src: PRODUCT_IMG_MAP[cat.id] || '/icon/四角星.png',
+                  mode: "aspectFill"
+                })
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "category-name",
                children: cat.name
@@ -192,9 +203,10 @@ function Index() {
          })
        }), filteredCategories.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "empty-category dashed-card",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "empty-icon",
-            children: "\uD83D\uDD0D"
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+            className: "empty-icon-img",
+            src: "/icon/\u641C\u7D22.png",
+            mode: "aspectFit"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
            className: "empty-text",
            children: "\u672A\u627E\u5230\u5339\u914D\u7684\u54C1\u7C7B"
@@ -20,7 +20,7 @@
 .header-title {
  font-size: 48rpx;
  font-weight: 800;
-  color: #5c3a3a;
+  color: var(--text-primary);
  letter-spacing: 4rpx;
 }

@@ -37,6 +37,7 @@
      -ms-flex-align: center;
          align-items: center;
  background: #f8f9fa;
+  border: 1rpx dashed rgba(0, 0, 0, 0.06);
  border-radius: 40rpx;
  padding: 16rpx 24rpx;
 }
@@ -46,51 +47,57 @@
  margin-right: 16rpx;
 }

+.search-icon-img {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 16rpx;
+}
+
 .search-input {
  -webkit-flex: 1;
      -ms-flex: 1;
          flex: 1;
  font-size: 28rpx;
-  color: #5c3a3a;
+  color: var(--text-primary);
  background: transparent;
  border: none;
  outline: none;
 }

 .search-input::-webkit-input-placeholder {
-  color: #b08d8d;
+  color: var(--text-secondary);
  font-size: 26rpx;
 }

 .search-input::-moz-placeholder {
-  color: #b08d8d;
+  color: var(--text-secondary);
  font-size: 26rpx;
 }

 .search-input:-ms-input-placeholder {
-  color: #b08d8d;
+  color: var(--text-secondary);
  font-size: 26rpx;
 }

 .search-input::-ms-input-placeholder {
-  color: #b08d8d;
+  color: var(--text-secondary);
  font-size: 26rpx;
 }

 .search-input::placeholder {
-  color: #b08d8d;
+  color: var(--text-secondary);
  font-size: 26rpx;
 }

 .search-result-hint {
  margin-top: 16rpx;
  padding-top: 16rpx;
-  border-top: 2rpx dashed #eee;
+  border-top: 2rpx dashed var(--line-star);
 }

 .hint-text {
  font-size: 24rpx;
-  color: #b08d8d;
+  color: var(--text-secondary);
 }

 /* 成品展示轮播 */
@@ -99,7 +106,7 @@
 }

 .showcase-swiper {
-  height: 460rpx;
+  height: 520rpx;
 }

 .showcase-swiper-item {
@@ -120,26 +127,23 @@
 .showcase-swiper-card {
  width: 100%;
  height: 100%;
-  padding: 20rpx;
  display: -webkit-flex;
  display: -ms-flexbox;
  display: flex;
  -webkit-flex-direction: column;
      -ms-flex-direction: column;
          flex-direction: column;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  position: relative;
+  border-radius: 24rpx;
+  overflow: hidden;
+  -webkit-box-shadow: var(--shadow-card);
+          box-shadow: var(--shadow-card);
  -webkit-box-sizing: border-box;
          box-sizing: border-box;
-  overflow: hidden;
 }

 .showcase-image-wrapper {
  width: 100%;
-  height: 240rpx;
-  border-radius: 16rpx;
+  height: 320rpx;
  display: -webkit-flex;
  display: -ms-flexbox;
  display: flex;
@@ -149,28 +153,53 @@
  -webkit-justify-content: center;
      -ms-flex-pack: center;
          justify-content: center;
-  margin-bottom: 16rpx;
+  overflow: hidden;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
+  position: relative;
 }

-.showcase-emoji {
-  font-size: 80rpx;
+.showcase-real-img {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
 }

-.showcase-info {
+.showcase-text-area {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
  text-align: center;
+  background: var(--bg-card);
+  padding: 16rpx 20rpx;
+  position: relative;
 }

 .showcase-info .showcase-title {
  font-size: 32rpx;
  font-weight: 700;
-  color: #5c3a3a;
+  color: var(--text-primary);
  display: block;
  margin-bottom: 8rpx;
 }

 .showcase-info .showcase-desc {
  font-size: 24rpx;
-  color: #b08d8d;
+  color: var(--text-secondary);
  display: block;
 }

@@ -178,12 +207,13 @@
  position: absolute;
  top: 16rpx;
  right: 16rpx;
-  background: rgba(255, 154, 158, 0.15);
-  color: #ff6b81;
+  background: rgba(255, 154, 158, 0.9);
+  color: #ffffff;
  font-size: 20rpx;
  padding: 4rpx 16rpx;
  border-radius: 20rpx;
-  font-weight: 500;
+  font-weight: 600;
+  z-index: 2;
 }

 /* 热门品类 */
@@ -208,7 +238,8 @@
      -ms-flex-align: center;
          align-items: center;
  text-align: center;
-  padding: 32rpx 20rpx;
+  padding: 0 0 24rpx;
+  overflow: hidden;
  -webkit-transition: -webkit-transform 0.2s;
  transition: -webkit-transform 0.2s;
  transition: transform 0.2s;
@@ -221,29 +252,40 @@
          transform: scale(0.96);
 }

-.category-icon {
-  font-size: 56rpx;
-  margin-bottom: 12rpx;
+/* 品类顶部实物照片 */
+.category-img-wrapper {
+  width: 100%;
+  height: 180rpx;
+  overflow: hidden;
+  border-radius: 16rpx;
+  margin-bottom: 16rpx;
+  position: relative;
 }

-.category-icon-img {
-  width: 120rpx;
-  height: 120rpx;
-  -o-object-fit: contain;
-     object-fit: contain;
-  margin-bottom: 12rpx;
+.category-img-real {
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
 }

 .category-name {
  font-size: 28rpx;
  font-weight: 700;
-  color: #5c3a3a;
+  color: var(--text-primary);
  margin-bottom: 8rpx;
 }

 .category-desc {
  font-size: 22rpx;
-  color: #b08d8d;
+  color: var(--text-secondary);
+}
+
+.category-price {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: var(--accent-pink);
+  margin-top: 8rpx;
 }

 /* 空状态 */
@@ -261,21 +303,22 @@
  text-align: center;
 }

-.empty-icon {
-  font-size: 64rpx;
+.empty-icon-img {
+  width: 48rpx;
+  height: 48rpx;
  margin-bottom: 16rpx;
 }

 .empty-text {
  font-size: 30rpx;
  font-weight: 600;
-  color: #5c3a3a;
+  color: var(--text-primary);
  margin-bottom: 8rpx;
 }

 .empty-sub {
  font-size: 24rpx;
-  color: #b08d8d;
+  color: var(--text-secondary);
 }

 /* 底部安全区 */
@@ -10,14 +10,15 @@
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ OrderDetailPage; }
 /* harmony export */ });
+/* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js */ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js");
 /* harmony import */ var F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "./node_modules/@tarojs/taro/index.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "./node_modules/react/cjs/react.production.min.js");
-/* harmony import */ var _utils_store__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../utils/store */ "./src/utils/store.ts");
-/* harmony import */ var _components_ThemeToggle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../components/ThemeToggle */ "./src/components/ThemeToggle/index.tsx");
-/* harmony import */ var _context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../context/ThemeContext */ "./src/context/ThemeContext.tsx");
+/* harmony import */ var _components_ThemeToggle__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../components/ThemeToggle */ "./src/components/ThemeToggle/index.tsx");
+/* harmony import */ var _context_ThemeContext__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../context/ThemeContext */ "./src/context/ThemeContext.tsx");
+/* harmony import */ var _utils_store__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../utils/store */ "./src/utils/store.ts");
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/cjs/react-jsx-runtime.production.min.js");


@@ -28,338 +29,378 @@



+
 function OrderDetailPage() {
-  var _design$designData, _design$designData$ca, _design$designData$ca2, _design$designData2, _design$designData$ca3, _design$designData$ca4, _design$designData$im, _design$designData$im2, _design$designData$im3;
-  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_4__.useThemeContext)(),
+  var _Taro$getCurrentInsta, _order$productIcon, _address$region;
+  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_3__.useThemeContext)(),
    theme = _useThemeContext.theme;
+  var params = (_Taro$getCurrentInsta = _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().getCurrentInstance().router) === null || _Taro$getCurrentInsta === void 0 ? void 0 : _Taro$getCurrentInsta.params;
+  var orderId = (params === null || params === void 0 ? void 0 : params.orderId) || '';
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
    _useState2 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState, 2),
    order = _useState2[0],
    setOrder = _useState2[1];
  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
    _useState4 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState3, 2),
-    design = _useState4[0],
-    setDesign = _useState4[1];
+    address = _useState4[0],
+    setAddress = _useState4[1];
+  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
+    _useState6 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState5, 2),
+    showAddrPicker = _useState6[0],
+    setShowAddrPicker = _useState6[1];
+  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)([]),
+    _useState8 = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_6__["default"])(_useState7, 2),
+    addrList = _useState8[0],
+    setAddrList = _useState8[1];
  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
-    var _Taro$getCurrentInsta;
-    var params = (_Taro$getCurrentInsta = _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().getCurrentInstance().router) === null || _Taro$getCurrentInsta === void 0 ? void 0 : _Taro$getCurrentInsta.params;
-    var orderId = params === null || params === void 0 ? void 0 : params.orderId;
-    if (!orderId) return;
-    var orders = (0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.getOrderList)();
-    var found = orders.find(function (o) {
-      return o.id === orderId;
+    var orders = (0,_utils_store__WEBPACK_IMPORTED_MODULE_4__.getOrderList)();
+    var o = orders.find(function (x) {
+      return x.id === orderId;
    });
-    setOrder(found || null);
-    if (found) {
-      var designs = (0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.getDesignList)();
-      var related = designs.find(function (d) {
-        return d.orderId === orderId;
+    if (o) {
+      setOrder(o);
+      // 优先显示订单已有地址，否则用默认地址
+      if (o.address) {
+        setAddress(o.address);
+      } else {
+        setAddress((0,_utils_store__WEBPACK_IMPORTED_MODULE_4__.getDefaultAddress)());
+      }
+    }
+    setAddrList((0,_utils_store__WEBPACK_IMPORTED_MODULE_4__.getAddressList)());
+  }, [orderId]);
+  var handlePickAddress = function handlePickAddress(addr) {
+    setAddress(addr);
+    setShowAddrPicker(false);
+    // 同步更新订单里的地址
+    var orders = (0,_utils_store__WEBPACK_IMPORTED_MODULE_4__.getOrderList)();
+    var idx = orders.findIndex(function (x) {
+      return x.id === orderId;
+    });
+    if (idx >= 0) {
+      orders[idx] = (0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__["default"])((0,F_weixin_wordc_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__["default"])({}, orders[idx]), {}, {
+        address: addr
      });
-      setDesign(related || null);
-    }
-  }, []);
-  var STATUS_MAP = {
-    pending: {
-      label: '待付款',
-      badge: 'badge-pink',
-      desc: '您尚未付款，请及时支付'
-    },
-    paid: {
-      label: '待发货',
-      badge: 'badge-blue',
-      desc: '商家正在准备发货'
-    },
-    shipping: {
-      label: '待收货',
-      badge: 'badge-blue',
-      desc: '快递运输中'
-    },
-    done: {
-      label: '已完成',
-      badge: 'badge-green',
-      desc: '交易已完成'
+      // 这里不直接写回 store，用临时状态即可，实际后端会有 order update API
    }
+    _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+      title: '地址已更改',
+      icon: 'success'
+    });
  };
  if (!order) {
-    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
      className: "theme-".concat(theme),
-      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
        className: "order-detail-page",
-        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "page-header dashed-card mt-20",
-          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "page-title",
-            children: "\u8BA2\u5355\u672A\u627E\u5230"
+            children: "\u8BA2\u5355\u4E0D\u5B58\u5728"
          })
        })
      })
    });
  }
-  var status = STATUS_MAP[order.statusCode] || STATUS_MAP.pending;
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
    className: "theme-".concat(theme),
-    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
      className: "order-detail-page",
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_2__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
        className: "page-header dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "flex-between",
          style: {
            width: '100%'
          },
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "back-btn",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
            },
            children: "\u2190"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "page-title",
            children: "\u8BA2\u5355\u8BE6\u60C5"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            style: {
              width: '60px'
            }
          })]
        })]
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-        className: "status-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        className: "status-banner dashed-card mt-20",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "status-top",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "badge ".concat(status.badge, " status-badge"),
-            children: status.label
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "status-desc",
-            children: status.desc
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+          className: "status-text",
+          children: [order.statusCode === 'pending' && '待付款', order.statusCode === 'paid' && '待发货', order.statusCode === 'shipping' && '待收货', order.statusCode === 'done' && '已完成']
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+          className: "status-desc",
+          children: [order.statusCode === 'pending' && '请在30分钟内完成支付', order.statusCode === 'paid' && '商品正在打包中，即将发货', order.statusCode === 'shipping' && '快递运输中，请注意查收', order.statusCode === 'done' && '交易已完成，感谢惠顾']
+        })]
+      }), (order.statusCode === 'shipping' || order.statusCode === 'done') && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        className: "logistics-card dashed-card mt-20",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "star-badge"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "logistics-header",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "flex-center",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "card-icon-img",
+              src: "/icon/\u5305\u88F9.png",
+              mode: "aspectFit"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "logistics-title",
+              children: "\u7269\u6D41\u4FE1\u606F"
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "logistics-num",
+            children: "\u5355\u53F7: SF1234567890"
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "logistics-timeline",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "timeline",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "timeline-item active",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "timeline-dot"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "timeline-content",
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-title",
-                children: "\u5DF2\u652F\u4ED8"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-time",
-                children: order.date
-              })]
-            })]
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-            className: "timeline-item",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "timeline-dot"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "timeline-content",
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-title",
-                children: "\u5546\u5BB6\u53D1\u8D27"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-time",
-                children: "\u5F85\u66F4\u65B0"
-              })]
-            })]
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-            className: "timeline-item",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "timeline-dot"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "timeline-content",
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-title",
+              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-status",
                children: "\u8FD0\u8F93\u4E2D"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
                className: "timeline-time",
-                children: "\u5F85\u66F4\u65B0"
+                children: "2024-01-15 14:30"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-desc",
+                children: "\u3010\u5317\u4EAC\u5E02\u3011\u5FEB\u4EF6\u5DF2\u5230\u8FBE\u5317\u4EAC\u671D\u9633\u8F6C\u8FD0\u4E2D\u5FC3"
              })]
            })]
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "timeline-item",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "timeline-dot"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "timeline-content",
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "timeline-title",
-                children: "\u5DF2\u7B7E\u6536"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-status",
+                children: "\u5DF2\u53D1\u8D27"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
                className: "timeline-time",
-                children: "\u5F85\u66F4\u65B0"
+                children: "2024-01-15 09:00"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-desc",
+                children: "\u3010\u6DF1\u5733\u5E02\u3011\u5546\u5BB6\u5DF2\u53D1\u8D27\uFF0C\u7B49\u5F85\u63FD\u6536"
+              })]
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "timeline-item",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              className: "timeline-dot"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              className: "timeline-content",
+              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-status",
+                children: "\u5DF2\u4E0B\u5355"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-time",
+                children: "2024-01-14 20:15"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                className: "timeline-desc",
+                children: "\u8BA2\u5355\u5DF2\u751F\u6210\uFF0C\u7B49\u5F85\u5546\u5BB6\u53D1\u8D27"
              })]
            })]
          })]
        })]
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-        className: "address-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "address-header",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "address-icon",
-            children: "\uD83D\uDCCD"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "address-title",
-            children: "\u6536\u8D27\u5730\u5740"
-          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "address-name",
-          children: "\u6536\u8D27\u4EBA\uFF1A\u667A\u7ED8\u5FAE\u523B\u7528\u6237"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "address-phone",
-          children: "138****8888"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "address-detail",
-          children: "\u5E7F\u4E1C\u7701\u6DF1\u5733\u5E02\u5357\u5C71\u533A\u79D1\u6280\u56ED\u667A\u7ED8\u5FAE\u523B\u603B\u90E8"
-        })]
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
        className: "product-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "section-title",
-          children: "\u5546\u54C1\u4FE1\u606F"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "product-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "product-icon-wrapper",
-            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-              className: "product-icon",
-              children: order.productIcon
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "product-icon-img",
+              src: (_order$productIcon = order.productIcon) !== null && _order$productIcon !== void 0 && _order$productIcon.startsWith('/icon/') ? order.productIcon : '/icon/四角星.png',
+              mode: "aspectFit"
            })
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "product-info",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
              className: "product-name",
              children: order.productName
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
              className: "product-sku",
              children: order.sku
            })]
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "price-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "price-label",
-            children: "\u5546\u54C1\u603B\u4EF7"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "price-value",
-            children: order.price
-          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "price-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "price-label",
-            children: "\u8FD0\u8D39"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "price-value",
-            children: "\xA50.00"
-          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "price-row total",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "price-label total-label",
            children: "\u5B9E\u4ED8\u6B3E"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "price-value total-value",
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "price-value",
            children: order.price
          })]
        })]
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-        className: "info-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        className: "address-card dashed-card mt-20",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "section-title",
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "address-header",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "flex-center",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "card-icon-img",
+              src: "/icon/\u5730\u5740.png",
+              mode: "aspectFit"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "address-title",
+              children: "\u6536\u8D27\u5730\u5740"
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "address-change",
+            onTap: function onTap() {
+              return setShowAddrPicker(true);
+            },
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "change-text",
+              children: "\u66F4\u6539\u6536\u8D27\u5730\u5740"
+            })
+          })]
+        }), address ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "address-body",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "address-row",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "address-name",
+              children: address.name
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "address-phone",
+              children: address.phone
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "address-detail",
+            children: [(_address$region = address.region) === null || _address$region === void 0 ? void 0 : _address$region.join(' '), " ", address.detail]
+          })]
+        }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "address-empty",
+          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            children: "\u6682\u65E0\u6536\u8D27\u5730\u5740\uFF0C\u8BF7\u5148\u6DFB\u52A0"
+          })
+        })]
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        className: "meta-card dashed-card mt-20",
+        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "star-badge"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+          className: "meta-title",
          children: "\u8BA2\u5355\u4FE1\u606F"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "info-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-label",
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "meta-row",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-label",
            children: "\u8BA2\u5355\u7F16\u53F7"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-value",
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-value",
            children: order.id
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "info-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-label",
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "meta-row",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-label",
            children: "\u521B\u5EFA\u65F6\u95F4"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-value",
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-value",
            children: order.date
          })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "info-row",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-label",
-            children: "\u652F\u4ED8\u65B9\u5F0F"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-            className: "info-value",
-            children: "\u5FAE\u4FE1\u652F\u4ED8"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "meta-row",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-label",
+            children: "\u6570\u91CF"
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+            className: "meta-value",
+            children: [order.count, " \u4EF6"]
          })]
        })]
-      }), design !== null && design !== void 0 && (_design$designData = design.designData) !== null && _design$designData !== void 0 && _design$designData.stickers ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-        className: "preview-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "section-title",
-          children: "\u8BBE\u8BA1\u6548\u679C"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "design-preview",
-          style: {
-            width: ((_design$designData$ca = design.designData.category) === null || _design$designData$ca === void 0 || (_design$designData$ca = _design$designData$ca.mask) === null || _design$designData$ca === void 0 ? void 0 : _design$designData$ca.width) || 300,
-            height: ((_design$designData$ca2 = design.designData.category) === null || _design$designData$ca2 === void 0 || (_design$designData$ca2 = _design$designData$ca2.mask) === null || _design$designData$ca2 === void 0 ? void 0 : _design$designData$ca2.height) || 420
-          },
-          children: design.designData.stickers.map(function (s) {
-            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
-              className: "preview-sticker",
-              src: s.src,
-              style: {
-                transform: "translate(".concat(s.x, "px, ").concat(s.y, "px) scale(").concat(s.scale || 1, ")"),
-                width: s.width || 200,
-                height: s.height || 200
-              },
-              mode: "aspectFit"
-            }, s.id);
-          })
-        })]
-      }) : design !== null && design !== void 0 && (_design$designData2 = design.designData) !== null && _design$designData2 !== void 0 && _design$designData2.imageSrc ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-        className: "preview-card dashed-card mt-20",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-          className: "section-title",
-          children: "\u8BBE\u8BA1\u6548\u679C"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-          className: "design-preview",
-          style: {
-            width: ((_design$designData$ca3 = design.designData.category) === null || _design$designData$ca3 === void 0 || (_design$designData$ca3 = _design$designData$ca3.mask) === null || _design$designData$ca3 === void 0 ? void 0 : _design$designData$ca3.width) || 300,
-            height: ((_design$designData$ca4 = design.designData.category) === null || _design$designData$ca4 === void 0 || (_design$designData$ca4 = _design$designData$ca4.mask) === null || _design$designData$ca4 === void 0 ? void 0 : _design$designData$ca4.height) || 420
-          },
-          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
-            className: "preview-sticker",
-            src: design.designData.imageSrc,
-            style: {
-              transform: "translate(".concat(((_design$designData$im = design.designData.imagePos) === null || _design$designData$im === void 0 ? void 0 : _design$designData$im.x) || 0, "px, ").concat(((_design$designData$im2 = design.designData.imagePos) === null || _design$designData$im2 === void 0 ? void 0 : _design$designData$im2.y) || 0, "px) scale(").concat(((_design$designData$im3 = design.designData.imagePos) === null || _design$designData$im3 === void 0 ? void 0 : _design$designData$im3.scale) || 1, ")")
-            },
-            mode: "aspectFit"
-          })
-        })]
-      }) : null, /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
        style: {
          height: '40px'
        }
+      }), showAddrPicker && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+        className: "modal-overlay",
+        style: {
+          alignItems: 'flex-end',
+          justifyContent: 'flex-end'
+        },
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+          className: "addr-picker-sheet dashed-card",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "addr-picker-header",
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "addr-picker-title",
+              children: "\u9009\u62E9\u6536\u8D27\u5730\u5740"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "addr-picker-close",
+              onTap: function onTap() {
+                return setShowAddrPicker(false);
+              },
+              children: "\u2715"
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "addr-picker-list",
+            children: [addrList.map(function (addr) {
+              var _addr$region;
+              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                className: "addr-picker-item ".concat((address === null || address === void 0 ? void 0 : address.id) === addr.id ? 'active' : ''),
+                onTap: function onTap() {
+                  return handlePickAddress(addr);
+                },
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+                  className: "addr-picker-row",
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                    className: "addr-picker-name",
+                    children: addr.name
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                    className: "addr-picker-phone",
+                    children: addr.phone
+                  }), addr.isDefault && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                    className: "addr-picker-default",
+                    children: "\u9ED8\u8BA4"
+                  })]
+                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                  className: "addr-picker-detail",
+                  children: [(_addr$region = addr.region) === null || _addr$region === void 0 ? void 0 : _addr$region.join(' '), " ", addr.detail]
+                })]
+              }, addr.id);
+            }), addrList.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+              className: "addr-picker-empty",
+              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+                children: "\u6682\u65E0\u5730\u5740\uFF0C\u8BF7\u5148\u6DFB\u52A0\u6536\u8D27\u5730\u5740"
+              })
+            })]
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
+            className: "addr-picker-add",
+            onTap: function onTap() {
+              setShowAddrPicker(false);
+              _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
+                url: '/pages/address/index'
+              });
+            },
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
+              className: "addr-picker-add-text",
+              children: "+ \u65B0\u5EFA\u6536\u8D27\u5730\u5740"
+            })
+          })]
+        })
      })]
    })
  });
@@ -119,29 +119,171 @@
  -webkit-align-items: center;
      -ms-flex-align: center;
          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
  margin-bottom: 16rpx;
 }

-.address-icon {
-  font-size: 32rpx;
-  margin-right: 12rpx;
-}
-
 .address-title {
  font-size: 30rpx;
  font-weight: 700;
  color: var(--text-primary);
 }

-.address-name,
-.address-phone,
+.address-change {
+  padding: 6rpx 16rpx;
+  border-radius: 8rpx;
+  background: rgba(91, 140, 255, 0.08);
+}
+
+.change-text {
+  font-size: 24rpx;
+  color: var(--accent-blue);
+}
+
+.address-body {
+  padding-top: 8rpx;
+}
+
+.address-row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  gap: 16rpx;
+  margin-bottom: 8rpx;
+}
+
+.address-name {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.address-phone {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
 .address-detail {
  font-size: 26rpx;
  color: var(--text-secondary);
-  display: block;
+  line-height: 1.5;
+}
+
+.address-empty {
+  padding: 32rpx 0;
+  text-align: center;
+}
+
+/* 底部弹窗 — 地址选择（样式复用 app.scss 全局定义，移除非必要覆写） */
+.addr-picker-header {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.addr-picker-title {
+  font-size: 32rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.addr-picker-close {
+  font-size: 28rpx;
+  color: var(--text-secondary);
+  padding: 8rpx;
+}
+
+.addr-picker-list {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  overflow-y: auto;
+}
+
+.addr-picker-item {
+  padding: 20rpx 16rpx;
+  border-bottom: 1rpx dashed rgba(0, 0, 0, 0.05);
+}
+
+.addr-picker-item.active {
+  background: rgba(91, 140, 255, 0.06);
+  border-radius: 12rpx;
+}
+
+.addr-picker-row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  gap: 16rpx;
  margin-bottom: 8rpx;
 }

+.addr-picker-name {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.addr-picker-phone {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.addr-picker-default {
+  font-size: 22rpx;
+  color: var(--accent-pink);
+  border: 1rpx solid var(--accent-pink);
+  padding: 2rpx 8rpx;
+  border-radius: 6rpx;
+}
+
+.addr-picker-detail {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.addr-picker-empty {
+  padding: 40rpx;
+  text-align: center;
+  color: var(--text-secondary);
+  font-size: 28rpx;
+}
+
+.addr-picker-add {
+  margin-top: 16rpx;
+  padding: 20rpx;
+  text-align: center;
+  border: 2rpx dashed var(--accent-blue);
+  border-radius: 12rpx;
+}
+
+.addr-picker-add-text {
+  font-size: 28rpx;
+  color: var(--accent-blue);
+}
+
+/* 卡片标题 icon（物流/地址） */
+.card-icon-img {
+  width: 32rpx;
+  height: 32rpx;
+  margin-right: 10rpx;
+}
+
 /* 商品卡片 */
 .product-card {
  padding: 32rpx;
@@ -172,10 +314,15 @@
      -ms-flex-pack: center;
          justify-content: center;
  margin-right: 20rpx;
+  overflow: hidden;
+  padding: 8rpx;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }

-.product-icon {
-  font-size: 56rpx;
+.product-icon-img {
+  width: 64rpx;
+  height: 64rpx;
 }

 .product-info {
@@ -264,7 +411,151 @@
  color: var(--text-primary);
 }

-/* 预览卡片 */
+/* 状态横幅 */
+.status-text {
+  font-size: 48rpx;
+  font-weight: 800;
+  color: var(--text-primary);
+  display: block;
+  margin-bottom: 10rpx;
+}
+
+/* 物流信息 */
+.logistics-header {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  margin-bottom: 24rpx;
+  padding-bottom: 16rpx;
+  border-bottom: 1rpx dashed rgba(0, 0, 0, 0.06);
+}
+
+.logistics-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+}
+
+.logistics-num {
+  font-size: 24rpx;
+  color: var(--text-secondary);
+}
+
+.timeline {
+  position: relative;
+  padding-left: 20rpx;
+}
+
+.timeline::before {
+  content: "";
+  position: absolute;
+  left: 8rpx;
+  top: 8rpx;
+  bottom: 8rpx;
+  width: 2rpx;
+  background: var(--line-star);
+  opacity: 0.3;
+}
+
+.timeline-item {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: flex-start;
+      -ms-flex-align: start;
+          align-items: flex-start;
+  margin-bottom: 24rpx;
+  position: relative;
+}
+
+.timeline-item:last-child {
+  margin-bottom: 0;
+}
+
+.timeline-dot {
+  width: 18rpx;
+  height: 18rpx;
+  border-radius: 50%;
+  background: var(--bg-card);
+  border: 3rpx solid var(--line-star);
+  margin-right: 20rpx;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
+  margin-left: -20rpx;
+  z-index: 2;
+}
+
+.timeline-item.active .timeline-dot {
+  background: var(--accent-pink);
+  border-color: var(--accent-pink);
+}
+
+.timeline-content {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+
+.timeline-status {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+  display: block;
+  margin-bottom: 6rpx;
+}
+
+.timeline-time {
+  font-size: 24rpx;
+  color: var(--text-secondary);
+  display: block;
+  margin-bottom: 4rpx;
+}
+
+.timeline-desc {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+  line-height: 1.4;
+}
+
+/* 订单信息 */
+.meta-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  color: var(--text-primary);
+  display: block;
+  margin-bottom: 16rpx;
+}
+
+.meta-row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: space-between;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+  padding: 16rpx 0;
+}
+
+.meta-label {
+  font-size: 26rpx;
+  color: var(--text-secondary);
+}
+
+.meta-value {
+  font-size: 26rpx;
+  color: var(--text-primary);
+}
+
 .preview-card {
  padding: 32rpx;
 }
@@ -147,7 +147,7 @@ function OrdersPage() {
            children: STATUS_TABS.map(function (tab) {
              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                className: "tab-item ".concat(activeTab === tab.code ? 'active' : ''),
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return setActiveTab(tab.code);
                },
                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
@@ -163,10 +163,12 @@ function OrdersPage() {
          className: "orders-list",
          scrollY: true,
          children: [filteredOrders.map(function (order) {
+            var _order$productIcon;
            var status = STATUS_MAP[order.statusCode] || STATUS_MAP.pending;
+            var iconSrc = (_order$productIcon = order.productIcon) !== null && _order$productIcon !== void 0 && _order$productIcon.startsWith('/icon/') ? order.productIcon : '/icon/四角星.png';
            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "order-card dashed-card",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return goDetail(order);
              },
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
@@ -184,9 +186,10 @@ function OrdersPage() {
                className: "order-body",
                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                  className: "order-icon-wrapper",
-                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-                    className: "order-icon",
-                    children: order.productIcon
+                  children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+                    className: "order-icon-img",
+                    src: iconSrc,
+                    mode: "aspectFit"
                  })
                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                  className: "order-info",
@@ -227,7 +230,7 @@ function OrdersPage() {
                  }), order.statusCode === 'shipping' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.Fragment, {
                    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                      className: "btn-outline order-btn",
-                      onClick: function onClick(e) {
+                      onTap: function onTap(e) {
                        e.stopPropagation();
                        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
                          title: '查看物流',
@@ -239,7 +242,7 @@ function OrdersPage() {
                      })
                    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                      className: "btn-gradient order-btn",
-                      onClick: function onClick(e) {
+                      onTap: function onTap(e) {
                        e.stopPropagation();
                        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
                          title: '确认收货',
@@ -253,7 +256,7 @@ function OrdersPage() {
                  }), order.statusCode === 'done' && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.Fragment, {
                    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                      className: "btn-outline order-btn",
-                      onClick: function onClick(e) {
+                      onTap: function onTap(e) {
                        e.stopPropagation();
                        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
                          title: '申请售后',
@@ -265,7 +268,7 @@ function OrdersPage() {
                      })
                    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                      className: "btn-gradient order-btn",
-                      onClick: function onClick(e) {
+                      onTap: function onTap(e) {
                        e.stopPropagation();
                        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
                          title: '再来一单',
@@ -278,7 +281,7 @@ function OrdersPage() {
                    })]
                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                    className: "btn-outline order-btn",
-                    onClick: function onClick(e) {
+                    onTap: function onTap(e) {
                      e.stopPropagation();
                      goDetail(order);
                    },
@@ -291,9 +294,10 @@ function OrdersPage() {
            }, order.id);
          }), filteredOrders.length === 0 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "empty-state",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-              className: "empty-icon",
-              children: "\uD83D\uDCE6"
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "empty-icon-img",
+              src: "/icon/\u5305\u88F9.png",
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
              className: "empty-text",
              children: "\u6682\u65E0\u8BA2\u5355"
@@ -302,7 +306,7 @@ function OrdersPage() {
              children: "\u53BB\u9996\u9875\u5F00\u59CB\u5B9A\u5236\u5427"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "btn-gradient",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
                  url: '/pages/index/index'
                });
@@ -116,6 +116,11 @@
  font-size: 56rpx;
 }

+.order-icon-img {
+  width: 56rpx;
+  height: 56rpx;
+}
+
 .order-info {
  -webkit-flex: 1;
      -ms-flex: 1;
@@ -203,20 +208,21 @@
  padding: 120rpx 40rpx;
 }

-.empty-icon {
-  font-size: 100rpx;
+.empty-icon-img {
+  width: 56rpx;
+  height: 56rpx;
  margin-bottom: 24rpx;
 }

 .empty-text {
  font-size: 36rpx;
  font-weight: 700;
-  color: #5c3a3a;
+  color: var(--text-primary);
  margin-bottom: 12rpx;
 }

 .empty-sub {
  font-size: 28rpx;
-  color: #b08d8d;
+  color: var(--text-secondary);
  margin-bottom: 40rpx;
 }
@@ -30,6 +30,7 @@



+
 var HERO_COLORS = ['#FFE4EC', '#FFF0F5', '#FCE4EC'];
 function ProductPage() {
  var _Taro$getCurrentInsta;
@@ -98,7 +99,7 @@ function ProductPage() {
          className: "flex-between",
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "back-btn",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
            },
            children: "\u2190"
@@ -144,9 +145,10 @@ function ProductPage() {
                },
                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                  className: "star-badge"
-                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-                  className: "hero-icon",
-                  children: product.icon
+                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+                  className: "hero-icon-img",
+                  src: (0,_utils_productConfig__WEBPACK_IMPORTED_MODULE_2__.getProductIconImg)(product),
+                  mode: "aspectFit"
                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
                  className: "hero-name",
                  children: product.name
@@ -211,13 +213,13 @@ function ProductPage() {
          })]
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "btn-outline",
-          onClick: handleAddToList,
+          onTap: handleAddToList,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            children: "\u52A0\u5165\u8BBE\u8BA1\u6E05\u5355"
          })
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "btn-gradient",
-          onClick: goToDIY,
+          onTap: goToDIY,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            children: "\u7ACB\u5373\u4E0B\u5355"
          })
@@ -235,9 +237,10 @@ function ProductPage() {
            children: "\u52A0\u5165\u8BBE\u8BA1\u6E05\u5355"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "modal-product",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-              className: "modal-icon",
-              children: product.icon
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "modal-icon-img",
+              src: (0,_utils_productConfig__WEBPACK_IMPORTED_MODULE_2__.getProductIconImg)(product),
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
              className: "modal-name",
              children: product.name
@@ -251,7 +254,7 @@ function ProductPage() {
              className: "qty-control",
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                className: "qty-btn",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return modQty(-1);
                },
                children: "\uFF0D"
@@ -260,7 +263,7 @@ function ProductPage() {
                children: quantity
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
                className: "qty-btn",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return modQty(1);
                },
                children: "\uFF0B"
@@ -279,7 +282,7 @@ function ProductPage() {
            className: "modal-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "btn-outline",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setShowModal(false);
              },
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
@@ -287,7 +290,7 @@ function ProductPage() {
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "btn-gradient",
-              onClick: confirmAdd,
+              onTap: confirmAdd,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
                children: "\u786E\u5B9A"
              })
@@ -47,6 +47,12 @@
  margin-bottom: 16rpx;
 }

+.hero-icon-img {
+  width: 100rpx;
+  height: 100rpx;
+  margin-bottom: 16rpx;
+}
+
 .hero-name {
  font-size: 36rpx;
  font-weight: 700;
@@ -183,6 +189,11 @@
  font-size: 48rpx;
 }

+.modal-icon-img {
+  width: 48rpx;
+  height: 48rpx;
+}
+
 .modal-name {
  font-size: 32rpx;
  color: var(--text-primary);
@@ -28,28 +28,51 @@



+var ICON_MAP = {
+  '我的设计': '/icon/调色盘.png',
+  '词云生成': '/icon/词云生成.png',
+  '收货地址': '/icon/地址.png',
+  '联系客服': '/icon/电话.png',
+  '使用帮助': '/icon/使用帮助.png',
+  '设置': '/icon/设置.png'
+};
+var STATUS_MAP = [{
+  key: 'toDesign',
+  label: '待设计',
+  icon: '/icon/三角尺.png'
+}, {
+  key: 'pending',
+  label: '待付款',
+  icon: '/icon/四角星.png'
+}, {
+  key: 'paid',
+  label: '待发货',
+  icon: '/icon/包裹.png'
+}, {
+  key: 'shipping',
+  label: '待收货',
+  icon: '/icon/杯子.png'
+}, {
+  key: 'done',
+  label: '已完成',
+  icon: '/icon/书本.png'
+}];
 var MENU_ITEMS = [{
-  icon: '🎨',
  label: '我的设计',
  path: '/pages/designList/index'
 }, {
-  icon: '✨',
  label: '词云生成',
  path: '/pages/wordcloud/index'
 }, {
-  icon: '📍',
  label: '收货地址',
  path: '/pages/address/index'
 }, {
-  icon: '📞',
  label: '联系客服',
  path: '/pages/service/index'
 }, {
-  icon: '📋',
  label: '使用帮助',
  path: '/pages/agreement/index'
 }, {
-  icon: '⚙️',
  label: '设置',
  path: '/pages/settings/index'
 }];
@@ -110,17 +133,26 @@ function ProfilePage() {
      }).length
    });
  };
-  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+  var sync = function sync() {
    var info = (0,_utils_store__WEBPACK_IMPORTED_MODULE_2__.getUserInfo)();
-    if (info) {
+    if (info !== null && info !== void 0 && info.openid) {
      setIsLoggedIn(true);
      setUserInfoState({
        nickName: info.nickName || '',
        avatarUrl: info.avatarUrl || ''
      });
+    } else {
+      setIsLoggedIn(false);
+      setUserInfoState({
+        nickName: '',
+        avatarUrl: ''
+      });
    }
    loadStats();
-  }, []);
+  };
+  (0,_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__.useDidShow)(function () {
+    sync();
+  });
  var handleOpenLogin = function handleOpenLogin() {
    return setShowLogin(true);
  };
@@ -161,14 +193,6 @@ function ProfilePage() {
    setLoginAvatarUrl(e.detail.avatarUrl || '');
  };
  var handleQuickClick = function handleQuickClick(type) {
-    if (!isLoggedIn) {
-      _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
-        title: '请先登录',
-        icon: 'none'
-      });
-      setShowLogin(true);
-      return;
-    }
    switch (type) {
      case 'toDesign':
        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().setStorageSync('designList:filter', 'toDesign');
@@ -177,7 +201,6 @@ function ProfilePage() {
        });
        break;
      case 'pending':
-        // 跳转订单页并带状态参数 - 这里用 event 或 storage 传递
        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().setStorageSync('orders:filter', 'pending');
        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
          url: '/pages/orders/index'
@@ -203,24 +226,30 @@ function ProfilePage() {
        break;
    }
  };
-  var handleMenuClick = function handleMenuClick(path) {
-    if (!path) {
+  var handleMenuClick = function handleMenuClick(path, label) {
+    if (!isLoggedIn && (path.includes('designList') || path.includes('orders'))) {
      _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
-        title: '功能开发中',
+        title: '请先登录',
        icon: 'none'
      });
+      setShowLogin(true);
+      return;
+    }
+    if (label === '联系客服') {
+      _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
+        url: '/pages/service/index',
+        fail: function fail(err) {
+          console.error('navigateTo service fail', err);
+          _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+            title: '跳转失败',
+            icon: 'none'
+          });
+        }
+      });
      return;
    }
    if (path.startsWith('/pages/')) {
      if (path.includes('designList') || path.includes('orders')) {
-        if (!isLoggedIn) {
-          _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
-            title: '请先登录',
-            icon: 'none'
-          });
-          setShowLogin(true);
-          return;
-        }
        _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().switchTab({
          url: path,
          fail: function fail(err) {
@@ -247,6 +276,9 @@ function ProfilePage() {
  };
  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
    className: "theme-".concat(theme),
+    style: {
+      minHeight: '100vh'
+    },
    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
      className: "profile-page",
      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
@@ -261,10 +293,11 @@ function ProfilePage() {
            mode: "aspectFill"
          }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "avatar-placeholder",
-            onClick: handleOpenLogin,
-            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-              className: "avatar-icon",
-              children: "\uD83D\uDC64"
+            onTap: handleOpenLogin,
+            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+              className: "avatar-icon-img",
+              src: "/icon/\u4E2A\u4EBA.png",
+              mode: "aspectFit"
            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "user-meta",
@@ -279,7 +312,7 @@ function ProfilePage() {
            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.Fragment, {
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "user-name",
-                onClick: handleOpenLogin,
+                onTap: handleOpenLogin,
                children: "\u70B9\u51FB\u767B\u5F55"
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "user-level",
@@ -289,80 +322,60 @@ function ProfilePage() {
          })]
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "status-grid",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "status-row row2",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-item",
-              onClick: function onClick() {
-                return handleQuickClick('toDesign');
-              },
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-num",
-                children: orderStats.toDesign
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-label",
-                children: "\u5F85\u8BBE\u8BA1"
-              })]
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-divider"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-item",
-              onClick: function onClick() {
-                return handleQuickClick('pending');
-              },
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-num",
-                children: orderStats.pending
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-label",
-                children: "\u5F85\u4ED8\u6B3E"
-              })]
-            })]
+            children: STATUS_MAP.slice(0, 2).map(function (s) {
+              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                className: "status-group",
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                  className: "status-item",
+                  onTap: function onTap() {
+                    return handleQuickClick(s.key);
+                  },
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                    className: "status-icon-img",
+                    src: s.icon,
+                    mode: "aspectFit"
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "status-num",
+                    children: orderStats[s.key]
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "status-label",
+                    children: s.label
+                  })]
+                }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                  className: "status-divider"
+                })]
+              }, s.key);
+            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "status-divider-h"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "status-row row3",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-item",
-              onClick: function onClick() {
-                return handleQuickClick('paid');
-              },
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-num",
-                children: orderStats.paid
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-label",
-                children: "\u5F85\u53D1\u8D27"
-              })]
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-divider"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-item",
-              onClick: function onClick() {
-                return handleQuickClick('shipping');
-              },
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-num",
-                children: orderStats.shipping
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-label",
-                children: "\u5F85\u6536\u8D27"
-              })]
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-divider"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
-              className: "status-item",
-              onClick: function onClick() {
-                return handleQuickClick('done');
-              },
-              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-num",
-                children: orderStats.done
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "status-label",
-                children: "\u5DF2\u5B8C\u6210"
-              })]
-            })]
+            children: STATUS_MAP.slice(2).map(function (s, idx) {
+              return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                className: "status-group",
+                children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                  className: "status-item",
+                  onTap: function onTap() {
+                    return handleQuickClick(s.key);
+                  },
+                  children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                    className: "status-icon-img",
+                    src: s.icon,
+                    mode: "aspectFit"
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "status-num",
+                    children: orderStats[s.key]
+                  }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                    className: "status-label",
+                    children: s.label
+                  })]
+                }), idx < 2 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+                  className: "status-divider"
+                })]
+              }, s.key);
+            })
          })]
        })]
      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
@@ -375,14 +388,15 @@ function ProfilePage() {
          children: MENU_ITEMS.map(function (item, idx) {
            return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "menu-card dashed-card",
-              onClick: function onClick() {
-                return handleMenuClick(item.path);
+              onTap: function onTap() {
+                return handleMenuClick(item.path, item.label);
              },
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
                className: "star-badge"
-              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-                className: "menu-icon",
-                children: item.icon
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                className: "menu-icon-img",
+                src: ICON_MAP[item.label],
+                mode: "aspectFit"
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                className: "menu-label",
                children: item.label
@@ -398,9 +412,16 @@ function ProfilePage() {
          className: "flex-between",
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "flex-column",
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-              className: "enterprise-title",
-              children: "\uD83C\uDFE2 \u4F01\u4E1A\u6279\u91CF\u5B9A\u5236"
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+              className: "flex-center",
+              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+                className: "enterprise-icon",
+                src: "/icon/\u4F01\u4E1A\u6279\u91CF\u5B9A\u5236.png",
+                mode: "aspectFit"
+              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+                className: "enterprise-title",
+                children: "\u4F01\u4E1A\u6279\u91CF\u5B9A\u5236"
+              })]
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
              className: "enterprise-desc",
              children: "\u5E74\u4F1A\u793C\u54C1\u3001\u5165\u804C\u7EAA\u5FF5\u3001\u56E2\u5EFA\u4F34\u624B\u793C"
@@ -436,9 +457,10 @@ function ProfilePage() {
              className: "avatar-img",
              src: loginAvatarUrl,
              mode: "aspectFill"
-            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
-              className: "avatar-placeholder",
-              children: "\u70B9\u51FB\u9009\u62E9\u5934\u50CF"
+            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+              className: "avatar-placeholder-img",
+              src: "/icon/\u4E2A\u4EBA.png",
+              mode: "aspectFit"
            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Input, {
            type: "nickname",
@@ -452,13 +474,13 @@ function ProfilePage() {
            className: "login-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-outline",
-              onClick: handleCloseLogin,
+              onTap: handleCloseLogin,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                children: "\u53D6\u6D88"
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-gradient",
-              onClick: handleLoginSubmit,
+              onTap: handleLoginSubmit,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                children: "\u767B\u5F55"
              })
@@ -95,14 +95,20 @@
  padding: 20rpx 0;
 }

-.status-row.row2 {
-  display: grid;
-  grid-template-columns: 1fr 2rpx 1fr;
-}
-
-.status-row.row3 {
-  display: grid;
-  grid-template-columns: 1fr 2rpx 1fr 2rpx 1fr;
+/* 每组（item + divider）作为一个 flex 单元 */
+.status-group {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
 }

 .status-item {
@@ -115,10 +121,10 @@
  -webkit-align-items: center;
      -ms-flex-align: center;
          align-items: center;
+  padding: 8rpx 0;
  -webkit-flex: 1;
      -ms-flex: 1;
          flex: 1;
-  padding: 8rpx 0;
 }

 .status-num {
@@ -138,6 +144,9 @@
  height: 48rpx;
  background: var(--line-star);
  opacity: 0.25;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
 }

 .status-divider-h {
@@ -212,7 +221,38 @@
  border-radius: 40rpx !important;
 }

-/* 登录弹窗 */
+.menu-icon-img {
+  width: 36rpx;
+  height: 36rpx;
+  margin-bottom: 12rpx;
+}
+
+/* 状态 icon 图片 */
+.status-icon-img {
+  width: 28rpx;
+  height: 28rpx;
+  margin-bottom: 4rpx;
+}
+
+/* 企业定制icon */
+.enterprise-icon {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 12rpx;
+}
+
+/* 头像占位图 */
+.avatar-icon-img {
+  width: 36rpx;
+  height: 36rpx;
+}
+
+/* 登录弹窗头像占位 */
+.avatar-placeholder-img {
+  width: 56rpx;
+  height: 56rpx;
+}
+
 .modal-overlay {
  position: fixed;
  top: 0;
@@ -40,6 +40,9 @@ function ServicePage() {
    theme = _useThemeContext.theme;
  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
    className: "theme-".concat(theme),
+    style: {
+      minHeight: '100vh'
+    },
    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
      className: "service-page",
      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_1__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
@@ -54,9 +57,10 @@ function ServicePage() {
        className: "service-hero dashed-card mt-20",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-          className: "service-icon",
-          children: "\uD83D\uDCAC"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
+          className: "service-hero-icon",
+          src: "/icon/\u7535\u8BDD.png",
+          mode: "aspectFit"
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
          className: "service-title",
          children: "\u667A\u7ED8\u5FAE\u523B\u5BA2\u670D\u4E2D\u5FC3"
@@ -65,14 +69,14 @@ function ServicePage() {
          children: "\u5DE5\u4F5C\u65E5 09:00 - 18:00 \u5728\u7EBF\u4E3A\u60A8\u670D\u52A1"
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
          className: "btn-gradient service-btn",
-          onClick: function onClick() {
+          onTap: function onTap() {
            return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
              title: '跳转客服会话',
              icon: 'none'
            });
          },
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-            children: "\uD83D\uDE80 \u53D1\u8D77\u54A8\u8BE2"
+            children: "\u53D1\u8D77\u54A8\u8BE2"
          })
        })]
      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
@@ -86,9 +90,10 @@ function ServicePage() {
            className: "contact-item dashed-card",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "star-badge"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-              className: "contact-icon",
-              children: "\uD83D\uDCDE"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
+              className: "contact-icon-img",
+              src: "/icon/\u7535\u8BDD.png",
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "contact-info",
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
@@ -101,16 +106,17 @@ function ServicePage() {
            })]
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
            className: "contact-item dashed-card",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().setClipboardData({
                data: 'smart_engraving'
              });
            },
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "star-badge"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-              className: "contact-icon",
-              children: "\uD83D\uDCAC"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
+              className: "contact-icon-img",
+              src: "/icon/\u8BCD\u4E91\u751F\u6210.png",
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "contact-info",
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
@@ -125,9 +131,10 @@ function ServicePage() {
            className: "contact-item dashed-card",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "star-badge"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-              className: "contact-icon",
-              children: "\uD83D\uDCE7"
+            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
+              className: "contact-icon-img",
+              src: "/icon/\u4F7F\u7528\u5E2E\u52A9.png",
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
              className: "contact-info",
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
@@ -163,9 +170,16 @@ function ServicePage() {
        className: "enterprise-service dashed-card mt-20 mb-20",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
          className: "star-badge"
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
-          className: "enterprise-title",
-          children: "\uD83C\uDFE2 \u4F01\u4E1A\u4E13\u5C5E\u5BA2\u6237\u7ECF\u7406"
+        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
+          className: "flex-center",
+          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
+            className: "enterprise-icon",
+            src: "/icon/\u4F01\u4E1A\u6279\u91CF\u5B9A\u5236.png",
+            mode: "aspectFit"
+          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
+            className: "enterprise-title",
+            children: "\u4F01\u4E1A\u4E13\u5C5E\u5BA2\u6237\u7ECF\u7406"
+          })]
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
          className: "enterprise-desc",
          children: "\u6279\u91CF\u8BA2\u5355\uFF0850\u4EF6\u4EE5\u4E0A\uFF09\u4EAB\u4E13\u5C5E\u62A5\u4EF7\u3001\u4F18\u5148\u6392\u4EA7\u3001\u4E13\u4EBA\u5BF9\u63A5"
@@ -27,8 +27,9 @@
  padding: 50rpx 40rpx;
 }

-.service-icon {
-  font-size: 80rpx;
+.service-hero-icon {
+  width: 56rpx;
+  height: 56rpx;
  margin-bottom: 20rpx;
 }

@@ -79,6 +80,15 @@
  margin-right: 24rpx;
 }

+.contact-icon-img {
+  width: 32rpx;
+  height: 32rpx;
+  margin-right: 24rpx;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
+}
+
 .contact-info {
  -webkit-flex: 1;
      -ms-flex: 1;
@@ -123,6 +133,12 @@
  padding: 32rpx;
 }

+.enterprise-icon {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 12rpx;
+}
+
 .enterprise-title {
  font-size: 30rpx;
  font-weight: 700;
@@ -30,6 +30,38 @@



+var MENU = [{
+  label: '个人信息',
+  icon: '/icon/个人.png',
+  action: function action(s) {
+    return s.setShowEdit(true);
+  }
+}, {
+  label: '账号管理',
+  icon: '/icon/账号管理.png',
+  action: function action() {
+    return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
+      url: '/pages/userDatabase/index'
+    });
+  }
+}, {
+  label: '定制协议',
+  icon: '/icon/定制协议.png',
+  action: function action() {
+    return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
+      url: '/pages/agreement/index'
+    });
+  }
+}, {
+  label: '关于我们',
+  icon: '/icon/关于我们.png',
+  action: function action() {
+    return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
+      title: '智绘微刻 v1.0',
+      icon: 'none'
+    });
+  }
+}];
 function SettingsPage() {
  var _useThemeContext = (0,_context_ThemeContext__WEBPACK_IMPORTED_MODULE_3__.useThemeContext)(),
    theme = _useThemeContext.theme;
@@ -87,40 +119,11 @@ function SettingsPage() {
  var onChooseAvatar = function onChooseAvatar(e) {
    setEditAvatar(e.detail.avatarUrl || '');
  };
-  var MENU = [{
-    label: '个人信息',
-    icon: '👤',
-    action: function action() {
-      return setShowEdit(true);
-    }
-  }, {
-    label: '账号管理',
-    icon: '🆔',
-    action: function action() {
-      return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
-        url: '/pages/userDatabase/index'
-      });
-    }
-  }, {
-    label: '定制协议',
-    icon: '📋',
-    action: function action() {
-      return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
-        url: '/pages/agreement/index'
-      });
-    }
-  }, {
-    label: '关于我们',
-    icon: 'ℹ️',
-    action: function action() {
-      return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().showToast({
-        title: '智绘微刻 v1.0',
-        icon: 'none'
-      });
-    }
-  }];
  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
    className: "theme-".concat(theme),
+    style: {
+      minHeight: '100vh'
+    },
    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
      className: "settings-page",
      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_ThemeToggle__WEBPACK_IMPORTED_MODULE_2__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
@@ -134,7 +137,7 @@ function SettingsPage() {
          },
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            className: "back-btn",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateBack();
            },
            children: "\u2190"
@@ -151,7 +154,7 @@ function SettingsPage() {
        className: "settings-user dashed-card mt-20",
        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "flex-between",
-          onClick: function onClick() {
+          onTap: function onTap() {
            return setShowEdit(true);
          },
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
@@ -162,8 +165,10 @@ function SettingsPage() {
              mode: "aspectFill"
            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "settings-avatar-placeholder",
-              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-                children: "\uD83D\uDC64"
+              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+                className: "settings-avatar-icon",
+                src: "/icon/\u4E2A\u4EBA.png",
+                mode: "aspectFit"
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              style: {
@@ -187,10 +192,15 @@ function SettingsPage() {
        children: MENU.map(function (item, idx) {
          return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
            className: "settings-item ".concat(idx < MENU.length - 1 ? 'bordered' : ''),
-            onClick: item.action,
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-              className: "settings-item-icon",
-              children: item.icon
+            onTap: function onTap() {
+              return item.action({
+                setShowEdit: setShowEdit
+              });
+            },
+            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "settings-item-icon-img",
+              src: item.icon,
+              mode: "aspectFit"
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
              className: "settings-item-label",
              children: item.label
@@ -204,7 +214,7 @@ function SettingsPage() {
        className: "mt-20",
        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
          className: "btn-outline logout-btn",
-          onClick: handleLogout,
+          onTap: handleLogout,
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
            children: "\u9000\u51FA\u767B\u5F55"
          })
@@ -230,9 +240,10 @@ function SettingsPage() {
              className: "avatar-img",
              src: editAvatar,
              mode: "aspectFill"
-            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
-              className: "avatar-placeholder",
-              children: "\u70B9\u51FB\u9009\u62E9\u5934\u50CF"
+            }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Image, {
+              className: "avatar-placeholder-img",
+              src: "/icon/\u4E2A\u4EBA.png",
+              mode: "aspectFit"
            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Input, {
            className: "nickname-input",
@@ -245,7 +256,7 @@ function SettingsPage() {
            className: "form-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "btn-outline",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setShowEdit(false);
              },
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
@@ -253,7 +264,7 @@ function SettingsPage() {
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.View, {
              className: "btn-gradient",
-              onClick: handleSaveInfo,
+              onTap: handleSaveInfo,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_8__.Text, {
                children: "\u4FDD\u5B58"
              })
@@ -32,7 +32,9 @@
  -webkit-justify-content: center;
      -ms-flex-pack: center;
          justify-content: center;
-  font-size: 48rpx;
+  padding: 30rpx;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }

 .settings-name {
@@ -71,9 +73,13 @@
  border-bottom: 1rpx dashed rgba(0, 0, 0, 0.06);
 }

-.settings-item-icon {
-  font-size: 32rpx;
+.settings-item-icon-img {
+  width: 32rpx;
+  height: 32rpx;
  margin-right: 16rpx;
+  -webkit-flex-shrink: 0;
+      -ms-flex-negative: 0;
+          flex-shrink: 0;
 }

 .settings-item-label {
@@ -152,7 +152,7 @@ function UserDatabasePage() {
            children: "\u5BC6\u7801\u9519\u8BEF\uFF0C\u8BF7\u91CD\u8BD5"
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
            className: "btn-gradient udb-btn",
-            onClick: handleUnlock,
+            onTap: handleUnlock,
            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
              children: "\u8FDB\u5165\u6570\u636E\u5E93"
            })
@@ -177,7 +177,7 @@ function UserDatabasePage() {
        className: "udb-toolbar",
        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
          className: "btn-gradient udb-add-btn",
-          onClick: function onClick() {
+          onTap: function onTap() {
            return setShowAdd(true);
          },
          children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -217,7 +217,7 @@ function UserDatabasePage() {
              className: "udb-col col-action",
              children: [u.openid !== activeOpenid && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
                className: "udb-link",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return handleSwitch(u.openid);
                },
                children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -228,7 +228,7 @@ function UserDatabasePage() {
                children: "\u5F53\u524D"
              }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
                className: "udb-link udb-danger",
-                onClick: function onClick() {
+                onTap: function onTap() {
                  return handleDelete(u.openid);
                },
                children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -264,7 +264,7 @@ function UserDatabasePage() {
            className: "udb-add-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-outline",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setShowAdd(false);
              },
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
@@ -272,7 +272,7 @@ function UserDatabasePage() {
              })
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
              className: "btn-gradient",
-              onClick: handleCreate,
+              onTap: handleCreate,
              children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
                children: "\u521B\u5EFA"
              })
@@ -126,7 +126,7 @@ function WordCloudPage() {
        className: "page-header flex-between",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
          className: "back-btn",
-          onClick: goBack,
+          onTap: goBack,
          children: "\u2190"
        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
          className: "page-title",
@@ -159,7 +159,7 @@ function WordCloudPage() {
        className: "step-content",
        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
          className: "upload-area dashed-card",
-          onClick: chooseImage,
+          onTap: chooseImage,
          children: baseImage ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Image, {
            className: "preview-image",
            src: baseImage,
@@ -184,7 +184,7 @@ function WordCloudPage() {
          className: "action-btns",
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
            className: "btn-gradient",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return setStep(2);
            },
            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
@@ -192,7 +192,7 @@ function WordCloudPage() {
            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
            className: "btn-outline",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return setBaseImage('');
            },
            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
@@ -234,13 +234,13 @@ function WordCloudPage() {
          className: "action-btns",
          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
            className: "btn-gradient",
-            onClick: handleGenerate,
+            onTap: handleGenerate,
            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
              children: "\u5F00\u59CB\u751F\u6210\u8BCD\u4E91"
            })
          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
            className: "btn-outline",
-            onClick: function onClick() {
+            onTap: function onTap() {
              return setStep(1);
            },
            children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
@@ -291,7 +291,7 @@ function WordCloudPage() {
            className: "result-actions",
            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
              className: "action-btn",
-              onClick: handleExportImage,
+              onTap: handleExportImage,
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
                className: "action-icon",
                children: "\uD83D\uDCBE"
@@ -301,7 +301,7 @@ function WordCloudPage() {
              })]
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
              className: "action-btn",
-              onClick: handleGenerate,
+              onTap: handleGenerate,
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
                className: "action-icon",
                children: "\uD83D\uDD04"
@@ -311,7 +311,7 @@ function WordCloudPage() {
              })]
            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
              className: "action-btn",
-              onClick: function onClick() {
+              onTap: function onTap() {
                return setStep(2);
              },
              children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
@@ -2,7 +2,7 @@
  "miniprogramRoot": "./",
  "projectname": "smart-engraving-miniapp",
  "description": "智绘微刻 - 词云微雕定制小程序",
-  "appid": "wxb6a8e61694e2b808",
+  "appid": "wxad998564cf43a7d9",
  "setting": {
    "urlCheck": true,
    "es6": false,