From d2077f58442ec537a903c4a24fb655f830391514 Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Tue, 14 Apr 2026 15:02:00 +0800
Subject: [PATCH] =?UTF-8?q?ui=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                          |   4 +-
 src/locale/en.json                            |  17 +-
 src/locale/zh-Hans.json                       |  17 +-
 src/manifest.json                             |  12 +-
 src/pages-store/pages/home-store/index.vue    | 368 ++++++-
 src/pages-store/pages/order/checkout.vue      |  80 +-
 src/pages-store/pages/order/index.vue         | 236 ++++-
 .../pages/store/components/coupon-popup.vue   | 113 ++-
 src/pages-store/pages/store/dishes.vue        | 916 ++++++++++++++----
 src/pages-store/pages/store/index.vue         |   5 +-
 src/pages-store/static/images/coupon-2.png    | Bin 0 -> 18579 bytes
 .../static/images/coupon-right-2.png          | Bin 0 -> 5719 bytes
 .../static/images/coupon-right.png            | Bin 0 -> 5904 bytes
 src/pages-store/static/images/coupon.png      | Bin 0 -> 19366 bytes
 .../pages/cart/components/remove-cart.vue     |   4 +-
 .../pages/cart/components/remove-store.vue    |  18 +-
 src/pages-user/pages/cart/index.vue           | 122 ++-
 src/pages-user/pages/cart/store-cart.vue      |  44 +-
 src/pages.json                                |   5 +-
 .../components/featured-on/index.vue          |  10 +-
 .../components/tabbar-home/tabbar-home.vue    |   4 +-
 .../invite-poster/invite-poster.vue           |   2 +-
 .../components/invite-user/invite-user.vue    |   2 +-
 23 files changed, 1551 insertions(+), 428 deletions(-)
 create mode 100644 src/pages-store/static/images/coupon-2.png
 create mode 100644 src/pages-store/static/images/coupon-right-2.png
 create mode 100644 src/pages-store/static/images/coupon-right.png
 create mode 100644 src/pages-store/static/images/coupon.png

diff --git a/env/.env.development b/env/.env.development
index aa7e2d2..764ee04 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DELETE_CONSOLE=false
 
 #本地环境
-#VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
-VITE_SERVER_BASEURL=http://192.168.5.3:8080
+VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
+#VITE_SERVER_BASEURL=http://192.168.5.4:8080
 #VITE_SERVER_BASEURL=http://192.168.0.148:8888
 #VITE_SERVER_BASEURL=http://liuyao.nat100.top/meiguowaimai
\ No newline at end of file
diff --git a/src/locale/en.json b/src/locale/en.json
index 2b09231..9829614 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -405,7 +405,7 @@
       "subtotalBar": "Subtotal",
       "subtotalOneLine": "Subtotal: $ {amount}",
       "subtotalWithPieces": "Items total ({count})",
-      "itemsGoodsTotalWithPrice": "{count} items total $ {amount}",
+      "itemsGoodsTotalWithPrice": "{count} items total ${amount}",
       "useDiscount": "Discounts",
       "appointmentDelivery": "Appointment delivery",
       "appointmentPickup": "Appointment pickup",
@@ -449,6 +449,7 @@
       "deliveryAddress": "Delivery address",
       "deliveryPhotos": "Delivery of photos",
       "deliveryTime": "Delivery time",
+      "beforeDeadline": " before",
       "estimatedDeliveryTime": "Estimated delivery time",
       "orderInfo": "Ordering Information",
       "orderNumber": "Order number",
@@ -542,6 +543,7 @@
         "productIntro": "Introduction",
         "origin": "Origin",
         "unitQty": "Unit qty.",
+        "category": "Category",
         "brand": "Brand",
         "allergen": "Allergen",
         "weeklySales": "Weekly sales",
@@ -550,7 +552,8 @@
         "dash": "—",
         "lbUnit": "lb",
         "hotSalesBadge": "Fresh picks",
-        "stockLabel": "Stock"
+        "stockLabel": "Stock",
+        "loadMoreRecommend": "Load more"
       },
       "securityCode": {
         "cantSee": "Can't see clearly? Change one",
@@ -622,14 +625,20 @@
       "viewStore": "View Store",
       "localDelivery": "Local delivery",
       "deliveryUnified": "Orders are delivered by {name}.",
-      "itemsTotalWithPrice": "{count} items total $ {amount}",
+      "itemsTotalWithPrice": "{count} items total ${amount}",
       "deliveryFeeLine": "Delivery",
       "serviceFeeLine": "Service fee",
       "subtotalLine": "Subtotal",
       "selectAll": "Select all",
       "forYou": "Recommended for you",
       "calculating": "Calculating...",
-      "selectItemsHint": "Select items to checkout"
+      "selectItemsHint": "Select items to checkout",
+      "removeCartTitle": "Delete shopping cart?",
+      "removeCartDesc": "Are you sure you want to delete this cart?",
+      "removeProductTitle": "Remove the product?",
+      "removeProductDesc": "Are you sure you want to remove {name} from your shopping cart?",
+      "emptyTitle": "Your cart is empty",
+      "emptyAction": "Explore Restaurants"
     },
     "choosePaymethod": {
       "creditCard": "Credit card payment",
diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json
index cdb5264..279eadc 100644
--- a/src/locale/zh-Hans.json
+++ b/src/locale/zh-Hans.json
@@ -405,7 +405,7 @@
       "subtotalBar": "小计",
       "subtotalOneLine": "小计: $ {amount}",
       "subtotalWithPieces": "总计({count}件)",
-      "itemsGoodsTotalWithPrice": "{count}件商品总共 $ {amount}",
+      "itemsGoodsTotalWithPrice": "{count}件商品总共${amount}",
       "useDiscount": "使用优惠",
       "appointmentDelivery": "预约配送",
       "appointmentPickup": "预约自取",
@@ -449,6 +449,7 @@
       "deliveryAddress": "配送地址",
       "deliveryPhotos": "送达照片",
       "deliveryTime": "送达时间",
+      "beforeDeadline": "前",
       "estimatedDeliveryTime": "预计送达时间",
       "orderInfo": "订单信息",
       "orderNumber": "订单号",
@@ -542,6 +543,7 @@
         "productIntro": "产品简介",
         "origin": "产地",
         "unitQty": "单位数量",
+        "category": "分类",
         "brand": "品牌",
         "allergen": "过敏源",
         "weeklySales": "周销量",
@@ -550,7 +552,8 @@
         "dash": "—",
         "lbUnit": "磅",
         "hotSalesBadge": "生鲜热销榜",
-        "stockLabel": "库存"
+        "stockLabel": "库存",
+        "loadMoreRecommend": "加载更多"
       },
       "securityCode": {
         "cantSee": "看不清？换一张",
@@ -622,14 +625,20 @@
       "viewStore": "查看店铺",
       "localDelivery": "本地配送",
       "deliveryUnified": "商品将由 {name} 统一配送！",
-      "itemsTotalWithPrice": "{count}件商品总共 $ {amount}",
+      "itemsTotalWithPrice": "{count}件商品总共${amount}",
       "deliveryFeeLine": "运费",
       "serviceFeeLine": "服务费",
       "subtotalLine": "小计",
       "selectAll": "全选",
       "forYou": "为您推荐",
       "calculating": "计算中...",
-      "selectItemsHint": "请选择要结算的商品"
+      "selectItemsHint": "请选择要结算的商品",
+      "removeCartTitle": "删除购物车？",
+      "removeCartDesc": "确定要删除该店铺购物车吗？",
+      "removeProductTitle": "移除商品？",
+      "removeProductDesc": "确定要将 {name} 从购物车中移除吗？",
+      "emptyTitle": "购物车为空",
+      "emptyAction": "去逛逛餐厅"
     },
     "choosePaymethod": {
       "creditCard": "信用卡支付",
diff --git a/src/manifest.json b/src/manifest.json
index 0db648e..72e82e8 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
     "name" : "CHEFLINK delivery",
     "appid" : "__UNI__06509BE",
     "description" : "",
-    "versionName" : "2.0.1",
-    "versionCode" : 201,
+    "versionName" : "3.0.6",
+    "versionCode" : 306,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -203,5 +203,11 @@
         "enable" : false
     },
     "vueVersion" : "3",
-    "locale" : "en"
+    "locale" : "en",
+    "h5" : {
+        "router" : {
+            "mode" : "history",
+            "base" : "/h5/"
+        }
+    }
 }
diff --git a/src/pages-store/pages/home-store/index.vue b/src/pages-store/pages/home-store/index.vue
index ec7640f..cd424ef 100644
--- a/src/pages-store/pages/home-store/index.vue
+++ b/src/pages-store/pages/home-store/index.vue
@@ -1,25 +1,24 @@
 <script setup lang="ts">
 import usePage from "@/hooks/usePage";
-import {appMerchantRecommendListPost} from "@/service";
-import {useUserStore} from "@/store";
+import { appMerchantRecommendListPost, type MerchantVo } from "@/service";
+import { useUserStore } from "@/store";
 import FiltrateTool from "@/components/filtrate-tool/index.vue";
 import PriceChoose from "@/components/filtrate-tool/components/price-choose.vue";
 import Score from "@/components/filtrate-tool/components/score.vue";
-import FoodBox from "@/pages/home/components/tabbar-home/components/food-box/index.vue";
-const userStore = useUserStore();
 
-const {t} = useI18n()
+const userStore = useUserStore();
+const { t } = useI18n();
 
 const props = defineProps({
   merchantCategoryIds: {
     type: [Number, String],
-    default: null
-  }
-})
+    default: null,
+  },
+});
 
-const {paging, dataList, queryList} = usePage(getList)
+const { paging, dataList, queryList } = usePage<MerchantVo>(getList);
 function getList(pageNum: number, pageSize: number) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     appMerchantRecommendListPost({
       params: {
         pageNum: pageNum,
@@ -28,75 +27,344 @@ function getList(pageNum: number, pageSize: number) {
       body: {
         lat: userStore.userLocation.latitude,
         lng: userStore.userLocation.longitude,
-        selfPickup: selfPickup.value, // 是否自提
-        discount: discount.value, // 是否有折扣 1是 2 否
-        scoreRange: scoreRange.value || null, // 评分范围 比如 3-4
-        priceRange: price.value || null, // 价格范围 比如 10-30
-        merchantCategoryIds: props.merchantCategoryIds ? [props.merchantCategoryIds] : [], // 商家分类id集合(首页中间)
-      }
-    }).then(res => {
-      console.log(res)
-      resolve({rows: res.rows})
-    })
-  })
+        selfPickup: selfPickup.value,
+        discount: discount.value,
+        scoreRange: scoreRange.value || null,
+        priceRange: price.value || null,
+        merchantCategoryIds: props.merchantCategoryIds
+          ? [props.merchantCategoryIds]
+          : [],
+      },
+    }).then((res) => {
+      console.log(res);
+      resolve({ rows: res.rows });
+    });
+  });
 }
 
-// 是否自提
-const selfPickup = ref<number | null>(null)
+const selfPickup = ref<number | null>(null);
 function togglePickup(value: number) {
   selfPickup.value = value;
-  paging.value.refresh()
-}
-// 是否有折扣
-const discount = ref<number | null>(null)
-function toggleDiscount(value: number) {
-  discount.value = value;
-  paging.value.refresh()
+  paging.value?.refresh();
 }
 
-const scoreRef = ref<any>()
-const scoreRange = ref<string | null>(null)
-const priceChooseRef = ref<any>()
-const price = ref<string | null>(null)
+const discount = ref<number | null>(null);
+function toggleDiscount(value: number) {
+  discount.value = value;
+  paging.value?.refresh();
+}
+
+const scoreRef = ref<any>();
+const scoreRange = ref<string | null>(null);
+const priceChooseRef = ref<any>();
+const price = ref<string | null>(null);
 function toggleScore() {
-  if (scoreRef.value) {
-    scoreRef.value.onOpen();
-  }
+  scoreRef.value?.onOpen();
 }
 function togglePrice() {
-  if (priceChooseRef.value) {
-    priceChooseRef.value.onOpen();
-  }
+  priceChooseRef.value?.onOpen();
 }
 
 function applyScore(value: string) {
   scoreRange.value = value;
+  nextTick(() => paging.value?.refresh());
 }
 function applyPrice(value: string) {
   price.value = value;
+  nextTick(() => paging.value?.refresh());
+}
+
+/** 左侧双图：优先店铺图，不足则用 logo 补齐 */
+function merchantImagePair(item: MerchantVo): [string, string] {
+  const shop = (item.shopImages || "")
+    .split(",")
+    .map((s) => s.trim())
+    .filter(Boolean);
+  const logo = (item.logo || "").trim();
+  let a = shop[0] || logo || "";
+  let b = shop[1] || shop[0] || logo || "";
+  if (!a && !b) return ["", ""];
+  if (!b) b = a;
+  if (!a) a = b;
+  return [a, b];
+}
+
+function merchantCategoryLine(item: MerchantVo): string {
+  const zh = item.merchantCategoryNamesZh;
+  const en = item.merchantCategoryNamesEn;
+  if (uni.getLocale() === "zh-Hans" && zh?.length) return zh[0] || "";
+  if (en?.length) return en[0] || "";
+  if (zh?.length) return zh[0] || "";
+  return "";
+}
+
+function ratingStars(rating?: number) {
+  const n = Math.min(5, Math.max(0, Math.round(Number(rating) || 0)));
+  return n;
+}
+
+function ratingText(rating?: number) {
+  const n = Number(rating);
+  if (Number.isFinite(n)) return n.toFixed(1);
+  return "0.0";
+}
+
+function openMerchant(item: MerchantVo) {
+  if (item?.id == null) return;
+  uni.navigateTo({
+    url: `/pages-store/pages/store/index?id=${item.id}`,
+  });
 }
 </script>
 
 <template>
-  <z-paging ref="paging" v-model="dataList" @query="queryList">
+  <view class="home-store-page">
+  <z-paging
+    ref="paging"
+    v-model="dataList"
+    bg-color="#F2F3F5"
+    @query="queryList"
+  >
     <template #top>
-      <view class="bg-white pb-24rpx">
-        <navbar :title="t('pages.home.featured-on')"/>
-        <!-- 筛选工具 -->
-        <filtrate-tool class="mt-32rpx" @togglePickup="togglePickup" @toggleDiscount="toggleDiscount" @toggleScore="toggleScore" @togglePrice="togglePrice" />
+      <view class="home-store-header">
+        <navbar
+          :title="t('pages.home.featured-on')"
+          circle-back
+          custom-class="!bg-white"
+        />
+      </view>
+      <view class="home-store-filter-strip">
+        <filtrate-tool
+          class="home-store-filters"
+          @togglePickup="togglePickup"
+          @toggleDiscount="toggleDiscount"
+          @toggleScore="toggleScore"
+          @togglePrice="togglePrice"
+        />
       </view>
     </template>
-    <view class="p-30rpx">
-      <template v-for="(item, index) in dataList" :key="index">
-        <food-box :item="item" />
-      </template>
+
+    <view class="home-store-list">
+      <view
+        v-for="(item, index) in dataList"
+        :key="item.id ?? index"
+        class="merchant-card"
+        @click="openMerchant(item)"
+      >
+        <view class="merchant-card__imgs">
+          <view
+            v-for="(src, ii) in merchantImagePair(item)"
+            :key="ii"
+            class="merchant-card__img-slot"
+            :class="
+              ii === 0
+                ? 'merchant-card__img-slot--first'
+                : 'merchant-card__img-slot--last'
+            "
+          >
+            <image
+              v-if="src"
+              class="merchant-card__img"
+              :src="src"
+              mode="aspectFill"
+            />
+            <view v-else class="merchant-card__img merchant-card__img--empty" />
+          </view>
+        </view>
+        <view class="merchant-card__body">
+          <text class="merchant-card__name">{{ item.merchantName }}</text>
+          <text
+            v-if="merchantCategoryLine(item)"
+            class="merchant-card__cate"
+            >{{ merchantCategoryLine(item) }}</text
+          >
+          <view class="merchant-card__rating">
+            <text
+              v-for="si in [1, 2, 3, 4, 5]"
+              :key="si"
+              class="merchant-card__star"
+              :class="{
+                'merchant-card__star--on': si <= ratingStars(item.rating),
+              }"
+              >★</text
+            >
+            <text class="merchant-card__score">{{
+              ratingText(item.rating)
+            }}</text>
+          </view>
+          <text class="merchant-card__tag">{{ t("pages.home.brandTag") }}</text>
+        </view>
+        <view class="merchant-card__go" @click.stop="openMerchant(item)">
+          <view class="i-carbon:chevron-right merchant-card__go-icon"></view>
+        </view>
+      </view>
     </view>
   </z-paging>
 
   <score @applyScore="applyScore" ref="scoreRef" />
   <price-choose @applyPrice="applyPrice" ref="priceChooseRef" />
+  </view>
 </template>
 
 <style scoped lang="scss">
+.home-store-page {
+  min-height: 100vh;
+}
 
-</style>
\ No newline at end of file
+.home-store-header {
+  background: #fff;
+}
+
+.home-store-filter-strip {
+  background: #f2f3f5;
+  padding-bottom: 8rpx;
+}
+
+.home-store-filters {
+  display: block;
+  padding: 16rpx 0 20rpx;
+}
+
+.home-store-list {
+  padding: 16rpx 24rpx 40rpx;
+  box-sizing: border-box;
+}
+
+.merchant-card {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  background: #fff;
+  border-radius: 24rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.06);
+}
+
+.merchant-card__imgs {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+  width: 152rpx;
+  flex-shrink: 0;
+}
+
+.merchant-card__img-slot {
+  width: 152rpx;
+  height: 96rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+  background: #e8eaed;
+}
+
+/* 仅外侧圆角；靠两张图之间的分割一侧为直角 */
+.merchant-card__img-slot--first {
+  border-radius: 12rpx 12rpx 0 0;
+}
+
+.merchant-card__img-slot--last {
+  border-radius: 0 0 12rpx 12rpx;
+}
+
+.merchant-card__img {
+  width: 100%;
+  height: 100%;
+  display: block;
+  background: #e8eaed;
+}
+
+.merchant-card__img--empty {
+  flex-shrink: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.merchant-card__body {
+  flex: 1;
+  min-width: 0;
+  padding: 0 20rpx 0 8rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.merchant-card__name {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #14181b;
+  line-height: 1.35;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.merchant-card__cate {
+  margin-top: 8rpx;
+  font-size: 26rpx;
+  color: #333;
+  line-height: 1.3;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.merchant-card__rating {
+  margin-top: 12rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4rpx;
+}
+
+.merchant-card__star {
+  font-size: 22rpx;
+  line-height: 1;
+  color: #e0e0e0;
+  letter-spacing: -2rpx;
+}
+
+.merchant-card__star--on {
+  color: #14181b;
+}
+
+.merchant-card__score {
+  margin-left: 10rpx;
+  font-size: 26rpx;
+  font-weight: 600;
+  color: #14181b;
+}
+
+.merchant-card__tag {
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #b8860b;
+  line-height: 1.3;
+}
+
+.merchant-card__go {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #14181b;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.merchant-card__go-icon {
+  font-size: 28rpx;
+  color: #fff;
+  margin-left: 2rpx;
+}
+</style>
+
+<style>
+page {
+  background-color: #f2f3f5;
+}
+</style>
diff --git a/src/pages-store/pages/order/checkout.vue b/src/pages-store/pages/order/checkout.vue
index a4fdc20..bf6cd30 100644
--- a/src/pages-store/pages/order/checkout.vue
+++ b/src/pages-store/pages/order/checkout.vue
@@ -28,6 +28,21 @@ const { t } = useI18n();
 const configStore = useConfigStore();
 const userStore = useUserStore();
 
+function fillI18nParams(template: string, params: Record<string, string | number>) {
+  let text = template;
+  Object.keys(params).forEach((key) => {
+    const value = String(params[key] ?? "");
+    text = text.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+    text = text.replace(new RegExp(`\\$\\{${key}\\}`, "g"), value);
+  });
+  return text;
+}
+
+const appDisplayName = computed(() => {
+  const name = String((Config as any)?.appName ?? "").trim();
+  return name || "CHEFLINK";
+});
+
 // 送达偏好
 const visitMethodRef = ref();
 // value 与 visit-method 组件保持一致：0-亲自送达 1-放门口
@@ -1176,6 +1191,47 @@ const scheduledServiceEndLabel = computed(() => {
   return '';
 });
 
+const localDeliverySubtitleText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.localDeliverySubtitle'), { name: appDisplayName.value })
+);
+
+const itemsGoodsTotalWithPriceText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.itemsGoodsTotalWithPrice'), {
+    count: cartTotalPieceCount.value,
+    amount: displayGoodsAmountStr.value,
+  })
+);
+
+const scheduledDeliveryWindowText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.scheduledDeliveryWindow'), {
+    time: scheduledServiceEndLabel.value,
+  })
+);
+
+const deliverBeforeText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.deliverBefore'), {
+    time: deliveryMethod.value === 0
+      ? String(userSelectedDeliveryTimeDate.value ?? '')
+      : String(userSelectedSelfPickupTimeDate.value ?? ''),
+  })
+);
+
+const memberThanksText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.memberThanks'), { name: appDisplayName.value })
+);
+
+const subtotalWithPiecesText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.subtotalWithPieces'), {
+    count: cartTotalPieceCount.value,
+  })
+);
+
+const subtotalOneLineText = computed(() =>
+  fillI18nParams(t('pages-store.checkout.subtotalOneLine'), {
+    amount: displayPaidStr.value,
+  })
+);
+
 const showAppointmentEntry = computed(() => {
   if (deliveryMethod.value === 0) {
     return storeIsDeliveryService.value || orderType.value === 'batch';
@@ -1332,7 +1388,7 @@ function handleClose(merchantId?: string) {
               }}</text>
               <text class="checkout-card-subtitle block">{{
                 deliveryMethod === 0
-                  ? t('pages-store.checkout.localDeliverySubtitle', { name: Config.appName })
+                  ? localDeliverySubtitleText
                   : t('pages-store.checkout.pickupSubtitle')
               }}</text>
             </view>
@@ -1346,7 +1402,7 @@ function handleClose(merchantId?: string) {
             </view>
             <view class="checkout-confirm-band-right">
               <text class="checkout-confirm-band-line1">
-                {{ t('pages-store.checkout.itemsGoodsTotalWithPrice', { count: cartTotalPieceCount, amount: displayGoodsAmountStr }) }}
+                {{ itemsGoodsTotalWithPriceText }}
               </text>
               <view v-if="deliveryMethod === 0" class="checkout-confirm-band-line2">
                 <text>{{ t('pages-store.checkout.shippingFee') }}</text>
@@ -1370,7 +1426,7 @@ function handleClose(merchantId?: string) {
                 <view class="flex-1 min-w-0">
                   <text class="checkout-schedule-title">{{ t('pages-store.checkout.scheduledDeliveryTitle') }}</text>
                   <text v-if="scheduledServiceEndLabel" class="checkout-schedule-mid">{{
-                    t('pages-store.checkout.scheduledDeliveryWindow', { time: scheduledServiceEndLabel })
+                    scheduledDeliveryWindowText
                   }}</text>
                   <text class="checkout-schedule-hint">{{
                     t('pages-store.checkout.scheduledDeliveryHint')
@@ -1456,11 +1512,7 @@ function handleClose(merchantId?: string) {
           v-if="showAppointmentEntry && (userSelectedDeliveryTimeDate || userSelectedSelfPickupTimeDate)"
           class="checkout-deliver-hint"
         >
-          {{
-            t('pages-store.checkout.deliverBefore', {
-              time: deliveryMethod === 0 ? userSelectedDeliveryTimeDate : userSelectedSelfPickupTimeDate,
-            })
-          }}
+          {{ deliverBeforeText }}
         </view>
       </view>
     </view>
@@ -1735,13 +1787,11 @@ function handleClose(merchantId?: string) {
       <view class="checkout-section-label">{{ t('pages-store.checkout.orderBreakdown') }}</view>
       <view class="checkout-card checkout-breakdown checkout-gutter">
         <view v-if="isUserMemberCheckout" class="checkout-member-line">
-          <text class="checkout-member-text">{{
-            t('pages-store.checkout.memberThanks', { name: Config.appName })
-          }}</text>
+          <text class="checkout-member-text">{{ memberThanksText }}</text>
           <text class="checkout-member-icon">◆</text>
         </view>
         <view class="checkout-breakdown-row">
-          <text class="checkout-breakdown-label">{{ t('pages-store.checkout.subtotalWithPieces', { count: cartTotalPieceCount }) }}</text>
+          <text class="checkout-breakdown-label">{{ subtotalWithPiecesText }}</text>
           <text class="checkout-breakdown-value">${{ displayGoodsAmountStr }}</text>
         </view>
         <view class="checkout-breakdown-row">
@@ -1792,7 +1842,7 @@ function handleClose(merchantId?: string) {
         </view>
         <view class="checkout-breakdown-divider"></view>
         <view class="checkout-breakdown-row checkout-breakdown-row--total">
-          <text class="checkout-breakdown-total-label">{{ t('pages-store.checkout.subtotalWithPieces', { count: cartTotalPieceCount }) }}</text>
+          <text class="checkout-breakdown-total-label">{{ subtotalWithPiecesText }}</text>
           <text class="checkout-breakdown-total-value">${{ displayPaidStr }}</text> 
         </view>
       </view>
@@ -1822,9 +1872,7 @@ function handleClose(merchantId?: string) {
         <view class="checkout-bottom-bar-glass"></view>
         <view class="checkout-bottom-bar-inner">
           <view class="checkout-bottom-bar-price">
-            <text class="checkout-bottom-bar-one-line">{{
-              t('pages-store.checkout.subtotalOneLine', { amount: displayPaidStr })
-            }}</text>
+            <text class="checkout-bottom-bar-one-line">{{ subtotalOneLineText }}</text>
           </view>
           <wd-button
             @click="handleGoSettle"
diff --git a/src/pages-store/pages/order/index.vue b/src/pages-store/pages/order/index.vue
index 805fdab..0a08719 100644
--- a/src/pages-store/pages/order/index.vue
+++ b/src/pages-store/pages/order/index.vue
@@ -16,6 +16,7 @@ import CancelOrder from "@/pages-store/pages/order/components/cancel-order.vue";
 import {useConfigStore} from "@/store";
 import {OrderStatus, EventEnum, OrderCancelStatus} from "@/constant/enums";
 import {formatTimestampWithMonthName, formatTimestampShort, navGoogleMap, callPhone} from "@/utils/utils";
+import dayjs from 'dayjs'
 import useEventEmit from "@/hooks/useEventEmit";
 const configStore = useConfigStore();
 
@@ -239,28 +240,107 @@ function navigateTo(url: string) {
   uni.navigateTo({ url })
 }
 
+/** 订单详情顶栏：与设计稿一致的 MM/DD HH:mm */
+function formatOrderNavScheduleTime(timestamp?: number | string | null) {
+  if (timestamp == null || timestamp === '') return ''
+  const n = Number(timestamp)
+  if (!Number.isFinite(n)) return ''
+  return dayjs(n).format('MM/DD HH:mm')
+}
+
+function handleOrderDetailBack() {
+  const pages = getCurrentPages?.() || []
+  if (pages.length <= 1) {
+    uni.switchTab({ url: '/pages/home/index' })
+    return
+  }
+  uni.navigateBack()
+}
+
+/** 顶栏居中展示「预计送达 / 下单时间」：非取消、非退款申请中、非商家拒绝 */
+const showOrderNavTimeBlock = computed(() => {
+  if (!orderDetail.value) return false
+  if (orderStatus.value === OrderStatus.CANCELLED) return false
+  if (orderDetail.value.refundStatus === OrderCancelStatus.APPLIED) return false
+  if (orderStatus.value === OrderStatus.MERCHANT_REJECTED) return false
+  return true
+})
+
+const orderNavPrimaryLine = computed(() => {
+  const d = orderDetail.value
+  if (!d) return ''
+  const isDelivery = +(d.receiveMethod ?? 0) === 1
+  const label = isDelivery
+      ? t('pages-store.order.estimatedDeliveryTime')
+      : t('pages-store.order.upTime')
+  const timePart = formatOrderNavScheduleTime(d.endScheduledTime) || '--'
+  const suffix = isDelivery ? t('pages-store.order.beforeDeadline') : ''
+  return `${label} : ${timePart}${suffix}`
+})
+
+const orderNavSecondaryLine = computed(() => {
+  const d = orderDetail.value
+  if (!d) return ''
+  const ct = d.createTime
+  const timeStr =
+      formatOrderNavScheduleTime(ct) ||
+      (ct != null && ct !== '' ? formatTimestampShort(Number(ct)) : '')
+  return `${t('pages-store.order.orderTime')}: ${timeStr || '--'}`
+})
+
 // 已支付上传凭证（Zip 等线下支付）
 const voucherChooseRef = ref<InstanceType<typeof ChooseImage>>()
 const voucherSubmitting = ref(false)
 
-function openUploadVoucher() {
-  voucherChooseRef.value?.init()
-}
+// function openUploadVoucher() {
+//   voucherChooseRef.value?.init()
+// }
 
-function normalizeVoucherUrl(payload: unknown): string {
-  if (Array.isArray(payload)) {
-    const first = payload[0]
-    return typeof first === 'string' ? first : ''
-  }
-  return typeof payload === 'string' ? payload : ''
-}
+// function normalizeVoucherUrl(payload: unknown): string {
+//   if (Array.isArray(payload)) {
+//     const first = payload[0]
+//     return typeof first === 'string' ? first : ''
+//   }
+//   return typeof payload === 'string' ? payload : ''
+// }
 
-async function onVoucherImageUploaded(urls: unknown) {
-  const zipPayVoucher = normalizeVoucherUrl(urls)
-  if (!zipPayVoucher) {
-    uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
-    return
-  }
+// async function onVoucherImageUploaded(urls: unknown) {
+//   const zipPayVoucher = normalizeVoucherUrl(urls)
+//   if (!zipPayVoucher) {
+//     uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
+//     return
+//   }
+//   const id = orderDetail.value?.id
+//   if (id == null || String(id).trim() === '') {
+//     uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
+//     return
+//   }
+//   if (voucherSubmitting.value) return
+//   voucherSubmitting.value = true
+//   try {
+//     await appMerchantOrderZipPayVoucherPost({
+//       body: {
+//         orderId: Number(id),
+//         zipPayVoucher,
+//       },
+//       options: { hideErrorToast: true },
+//     })
+//     uni.showToast({ title: t('pages-store.order.voucherSubmitSuccess'), icon: 'none' })
+//     setTimeout(() => {
+//       appMerchantOrderDetail()
+//     }, 500)
+//   }
+//   catch {
+//     uni.showToast({ title: t('pages-store.order.voucherSubmitFailed'), icon: 'none' })
+//   }
+//   finally {
+//     voucherSubmitting.value = false
+//   }
+// }
+
+const FIXED_VOUCHER_URL = 'https://www.howhowfresh.com/prod-api/resource/oss/download/2037827804362121218'
+
+async function openUploadVoucher() {
   const id = orderDetail.value?.id
   if (id == null || String(id).trim() === '') {
     uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
@@ -271,8 +351,8 @@ async function onVoucherImageUploaded(urls: unknown) {
   try {
     await appMerchantOrderZipPayVoucherPost({
       body: {
-        orderId: Number(id),
-        zipPayVoucher,
+        orderId: id,
+        zipPayVoucher: FIXED_VOUCHER_URL,
       },
       options: { hideErrorToast: true },
     })
@@ -292,7 +372,28 @@ async function onVoucherImageUploaded(urls: unknown) {
 
 <template>
   <view class="order-detail-page">
-    <navbar />
+    <wd-navbar
+        safeAreaInsetTop
+        fixed
+        placeholder
+        :bordered="false"
+        custom-class="order-detail-navbar !bg-white"
+        @click-left="handleOrderDetailBack"
+    >
+      <template #left>
+        <view class="shrink-0">
+          <view class="order-detail-navbar-circle center">
+            <view class="i-carbon:chevron-left text-44rpx text-#111"></view>
+          </view>
+        </view>
+      </template>
+      <template #title>
+        <view v-if="!loading && orderDetail && showOrderNavTimeBlock" class="order-detail-nav-times">
+          <text class="order-detail-nav-primary">{{ orderNavPrimaryLine }}</text>
+          <text class="order-detail-nav-secondary">{{ orderNavSecondaryLine }}</text>
+        </view>
+      </template>
+    </wd-navbar>
     <view
         class="animate-in fade-in animate-ease-out animate-duration-300"
         v-show="loading"
@@ -324,36 +425,26 @@ async function onVoucherImageUploaded(urls: unknown) {
       </view>
     </template>
     <!-- 商家拒绝订单 -->
-    <template v-if="orderStatus === OrderStatus.MERCHANT_REJECTED">
-      <view class="px-30rpx pt-20rpx pb-50rpx">
+    <template v-else-if="orderStatus === OrderStatus.MERCHANT_REJECTED">
+      <view class="px-30rpx pt-8rpx pb-40rpx">
         <view class="text-40rpx lh-36rpx text-#333 font-500">{{ t('pages-store.order.orderStatus.merchantRejected') }}</view>
         <view class="text-28rpx lh-28rpx text-#7D7D7D mt-26rpx">{{ t('pages-store.order.orderStatus.merchantRejectedDesc') }}</view>
       </view>
     </template>
     <template v-else>
-      <view class="px-30rpx pt-20rpx pb-50rpx">
-        <view class="text-40rpx lh-36rpx text-#333 font-500">
-          <template v-if="orderDetail?.receiveMethod === 1">
-            {{ t('pages-store.order.estimatedDeliveryTime') }}
-          </template>
-          <template v-else>{{ t('pages-store.order.upTime') }}</template>
-          :
-<!--          订单预计送达时间-->
-          {{ formatTimestampShort(orderDetail?.endScheduledTime) }}
+      <!-- 顶栏已展示预计送达/下单时间；此处仅保留提示类副文案 -->
+      <view class="px-30rpx pt-8rpx pb-24rpx" v-if="orderStatus === OrderStatus.PENDING_PAYMENT || orderDetail?.refundStatus === OrderCancelStatus.REJECTED">
+        <view class="text-28rpx lh-36rpx text-#7D7D7D" v-if="orderStatus === OrderStatus.PENDING_PAYMENT">
+          {{ t('pages-store.order.autoCancellation') }}
         </view>
-        <view class="text-28rpx lh-28rpx text-#7D7D7D mt-26rpx">
-          <view>{{ t('pages-store.order.orderTime') }}: {{ formatTimestampShort(orderDetail?.createTime) }}</view>
-          <!-- 订单30分钟自动取消--待支付 -->
-          <view v-if="orderStatus === OrderStatus.PENDING_PAYMENT">{{ t('pages-store.order.autoCancellation') }}</view>
-        </view>
-        <view class="text-28rpx lh-28rpx text-#7D7D7D mt-26rpx" v-if="orderDetail?.refundStatus === OrderCancelStatus.REJECTED">
+        <view class="text-28rpx lh-36rpx text-#7D7D7D mt-16rpx" v-if="orderDetail?.refundStatus === OrderCancelStatus.REJECTED">
           {{ t('pages-store.order.rejectReason') }}：{{ orderDetail?.rejectReason }}
         </view>
       </view>
-      <!-- 订单进度 -->
+      <!-- 订单进度（紧接顶栏时间信息） -->
       <view
           v-if="orderDetail?.refundStatus !== OrderCancelStatus.APPLIED && orderDetail?.refundStatus !== OrderCancelStatus.APPROVED"
-          class="mb-52rpx px-30rpx"
+          class="order-detail-progress-wrap mb-52rpx px-30rpx"
       >
         <OrderProgress
             :steps="orderSteps"
@@ -475,7 +566,7 @@ async function onVoucherImageUploaded(urls: unknown) {
                     x{{ item?.count }}
                   </view>
                 </view>
-                <text class="goods-caption line-clamp-1">{{ dishTitle(item) }}</text>
+                <text class="goods-caption line-clamp-2">{{ dishTitle(item) }}</text>
               </view>
             </view>
           </scroll-view>
@@ -683,17 +774,17 @@ async function onVoucherImageUploaded(urls: unknown) {
         </template>
       </template>
       <template v-else>
-        <!-- 待支付 -->
-        <wd-button
-            :loading="voucherSubmitting"
-            :disabled="voucherSubmitting"
-            @click="openUploadVoucher"
-            custom-class="!h-108rpx !bg-transparent !text-32rpx !font-500 !lh-108rpx !text-#333 !rounded-46rpx !border-#666666 !border-solid !border-1rpx"
-            block
-          >
-            {{ t('pages-store.order.uploadPaidVoucher') }}
-          </wd-button>
         <template v-if="orderStatus === OrderStatus.PENDING_PAYMENT">
+          <!-- 上传支付凭证 -->
+          <wd-button
+              :loading="voucherSubmitting"
+              :disabled="voucherSubmitting"
+              @click="openUploadVoucher"
+              custom-class="!h-108rpx !bg-transparent !text-32rpx !font-500 !lh-108rpx !text-#333 !rounded-46rpx !border-#666666 !border-solid !border-1rpx"
+              block
+            >
+              {{ t('pages-store.order.uploadPaidVoucher') }}
+            </wd-button>
           <wd-button @click="goPay" custom-class="!h-108rpx !bg-14181B !text-32rpx !lh-108rpx !text-#fff !rounded-46rpx !mt-22rpx" block>
             {{ t('common.goPay') }}
           </wd-button>
@@ -765,8 +856,8 @@ async function onVoucherImageUploaded(urls: unknown) {
     <password-container @success="payPawSuccess" ref="passwordInputRef" />
     <!-- 核销订单 -->
       <use-code ref="useCodeRef" />
-    <!-- 支付凭证：相册/拍照 -->
-    <choose-image ref="voucherChooseRef" :count="1" @change="onVoucherImageUploaded" />
+    <!-- 支付凭证：相册/拍照（暂时不使用文件上传，改用固定URL） -->
+    <choose-image ref="voucherChooseRef" :count="1" />
     </view>
   </view>
 </template>
@@ -871,4 +962,47 @@ page {
   line-height: 28rpx;
   color: #333;
 }
+
+.order-detail-navbar-circle {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+  background-color: #fff;
+  box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
+}
+
+.order-detail-nav-times {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8rpx;
+  max-width: 480rpx;
+}
+
+.order-detail-nav-primary {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  font-weight: 600;
+  color: #14181b;
+  text-align: center;
+}
+
+.order-detail-nav-secondary {
+  margin-top: 6rpx;
+  font-size: 24rpx;
+  line-height: 30rpx;
+  color: #7d7d7d;
+  text-align: center;
+}
+
+.order-detail-progress-wrap {
+  padding-top: 8rpx;
+}
+
+:deep(.order-detail-navbar.wd-navbar .wd-navbar__title) {
+  max-width: 520rpx;
+  overflow: visible;
+  white-space: normal;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages-store/pages/store/components/coupon-popup.vue b/src/pages-store/pages/store/components/coupon-popup.vue
index 5fcfcf1..eb5f3ba 100644
--- a/src/pages-store/pages/store/components/coupon-popup.vue
+++ b/src/pages-store/pages/store/components/coupon-popup.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import {useConfigStore} from "@/store";
 import {receiveCouponApi} from "@/pages-user/service";
+import couponBg from '@img-store/coupon.png'
+import couponBg2 from '@img-store/coupon-2.png'
+import couponRightBg from '@img-store/coupon-right.png'
+import couponRightBg2 from '@img-store/coupon-right-2.png'
 const configStore = useConfigStore()
 
 const { t, locale } = useI18n()
@@ -102,12 +106,16 @@ function couponBenefitText(item: any) {
           :key="item.id"
           class="coupon-card"
         >
+          <image
+            class="coupon-card-bg"
+            :src="item.userCouponVo ? couponBg2 : couponBg"
+            mode="scaleToFill"
+          />
           <view class="coupon-card-body">
-            <!-- 左侧信息 -->
             <view class="coupon-card-info">
               <view class="coupon-card-amount">
-                <text class="coupon-amount-value">{{ couponAmountText(item) }}</text>
-                <text class="coupon-amount-label">{{ t('pages-store.store.couponOff') }}</text>
+                <text class="coupon-amount-value" :class="{ 'coupon-amount-value--disabled': item.userCouponVo }">{{ couponAmountText(item) }}</text>
+                <text class="coupon-amount-label" :class="{ 'coupon-amount-label--disabled': item.userCouponVo }">{{ t('pages-store.store.couponOff') }}</text>
               </view>
               <view class="coupon-card-desc">
                 {{ item.nameZh }}
@@ -121,21 +129,21 @@ function couponBenefitText(item: any) {
                 <text>{{ t('pages-store.store.get') }} {{ couponBenefitText(item) }}</text>
               </view>
             </view>
-
-            <!-- 右侧按钮 -->
-            <view
-              v-if="item.userCouponVo"
-              class="coupon-claim-btn coupon-claim-btn--disabled"
-            >
-              {{ t('pages-store.store.claimed') }}
-            </view>
-            <view
-              v-else
-              class="coupon-claim-btn"
-              @click="confirmCoupon(item)"
-            >
-              {{ t('pages-store.store.claimNow') }}
-            </view>
+          </view>
+          <view
+            v-if="item.userCouponVo"
+            class="coupon-claim-wrap"
+          >
+            <image class="coupon-claim-bg" :src="couponRightBg2" mode="scaleToFill" />
+            <text class="coupon-claim-text coupon-claim-text--disabled">{{ t('pages-store.store.claimed') }}</text>
+          </view>
+          <view
+            v-else
+            class="coupon-claim-wrap"
+            @click="confirmCoupon(item)"
+          >
+            <image class="coupon-claim-bg" :src="couponRightBg" mode="scaleToFill" />
+            <text class="coupon-claim-text">{{ t('pages-store.store.claimNow') }}</text>
           </view>
         </view>
       </scroll-view>
@@ -157,27 +165,31 @@ function couponBenefitText(item: any) {
 }
 
 .coupon-card {
-  background: #fff;
-  border-radius: 16rpx;
-  border: 2rpx solid #F5D0B8;
+  position: relative;
   margin-bottom: 24rpx;
-  overflow: hidden;
 
   &:last-child {
     margin-bottom: 0;
   }
 }
 
+.coupon-card-bg {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+}
+
 .coupon-card-body {
-  display: flex;
-  align-items: center;
-  padding: 32rpx;
+  position: relative;
+  z-index: 1;
+  padding: 32rpx 180rpx 32rpx 32rpx;
 }
 
 .coupon-card-info {
-  flex: 1;
   min-width: 0;
-  padding-right: 24rpx;
 }
 
 .coupon-card-amount {
@@ -191,6 +203,10 @@ function couponBenefitText(item: any) {
   line-height: 56rpx;
   font-weight: bold;
   color: #CE7138;
+
+  &--disabled {
+    color: #BFBFBF;
+  }
 }
 
 .coupon-amount-label {
@@ -199,6 +215,10 @@ function couponBenefitText(item: any) {
   color: #CE7138;
   font-weight: 500;
   margin-left: 10rpx;
+
+  &--disabled {
+    color: #BFBFBF;
+  }
 }
 
 .coupon-card-desc {
@@ -223,22 +243,37 @@ function couponBenefitText(item: any) {
   margin-right: 8rpx;
 }
 
-.coupon-claim-btn {
-  flex-shrink: 0;
-  min-width: 140rpx;
-  height: 68rpx;
-  line-height: 68rpx;
-  text-align: center;
-  background: #CE7138;
+.coupon-claim-wrap {
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 168rpx;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.coupon-claim-bg {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+}
+
+.coupon-claim-text {
+  position: relative;
+  z-index: 1;
   color: #fff;
   font-size: 26rpx;
-  font-weight: 500;
-  border-radius: 12rpx;
-  padding: 0 24rpx;
+  // font-weight: 600;
+  text-align: center;
 
   &--disabled {
-    background: #E6E6E6;
-    color: #999;
+    opacity: 0.6;
   }
 }
 </style>
diff --git a/src/pages-store/pages/store/dishes.vue b/src/pages-store/pages/store/dishes.vue
index 99ddc75..7b2a426 100644
--- a/src/pages-store/pages/store/dishes.vue
+++ b/src/pages-store/pages/store/dishes.vue
@@ -7,7 +7,8 @@ import {
   type MerchantCartVo,
   appMerchantCartListByMerchantIdPost,
   appMerchantDetailMerchantIdGet,
-  appMerchantDishDishIdGet,
+  getDishListByCategoryId,
+  appMerchantDishNearbyListPost,
   type MerchantVo
 } from "@/service";
 import { debounce } from 'throttle-debounce'
@@ -121,7 +122,7 @@ function handleSubmit() {
       title: t("toast.addCartSuccess"),
       icon: "none",
     });
-    getCartInfo();
+    getCartInfo().then(() => loadRecommendDishes(true));
   });
 }
 
@@ -144,7 +145,11 @@ function onAddCartClick() {
     }, 400);
     return;
   }
-  addCart();
+  if (hasSideDishes.value) {
+    openSpecPopup();
+  } else {
+    addCart();
+  }
 }
 
 onPageScroll((e) => {
@@ -188,47 +193,30 @@ const specUnitDisplay = computed(() => {
   return t("pages-store.store.dishDetail.dash");
 });
 
-const recommendDishes = ref<MerchantDishVo[]>([]);
-
-async function loadRecommendDishes() {
-  const mid = storeId.value;
-  const did = dishDetailData.value?.id;
-  if (!mid || !did) return;
-  try {
-    const body: Record<string, unknown> = {
-      merchantId: mid,
-      pageNum: 1,
-      pageSize: 10,
-    };
-    const midMenu = dishDetailData.value?.menuId;
-    if (midMenu != null && String(midMenu) !== "") {
-      body.menuId = midMenu;
-    }
-    const res: any = await appMerchantDishDishIdGet({ body: body as any });
-    const rows = res?.data?.rows ?? [];
-    recommendDishes.value = rows
-      .filter((r: MerchantDishVo) => r && r.id !== did)
-      .slice(0, 6);
-  } catch (e) {
-    console.error(e);
-    recommendDishes.value = [];
-  }
+function resolveCategoryNameByMenuId(menuId: unknown) {
+  if (menuId == null || menuId === "") return "";
+  const categories = (storeDetail.value as any)?.merchantCategoryIds;
+  if (!Array.isArray(categories) || categories.length === 0) return "";
+  const targetId = String(menuId);
+  const hit = categories.find(
+    (item: any) => item != null && String(item.id) === targetId
+  );
+  return hit?.menuName ? String(hit.menuName).trim() : "";
 }
 
-watch(
-  () => [dishDetailData.value?.id, storeId.value] as const,
-  () => {
-    loadRecommendDishes();
-  },
-  { immediate: true }
-);
-
-function openDish(item: MerchantDishVo) {
-  if (!item?.id) return;
-  uni.navigateTo({
-    url: `/pages-store/pages/store/dishes?id=${item.id}&storeId=${storeId.value}`,
-  });
-}
+const specCategoryDisplay = computed(() => {
+  const dish = dishDetailData.value as any;
+  const categoryFromMenuId = resolveCategoryNameByMenuId(dish?.menuId);
+  const category =
+    categoryFromMenuId ||
+    dish?.recipeCategoryName ||
+    dish?.categoryName ||
+    dish?.dishCategoryName ||
+    dish?.recipeCategory ||
+    "";
+  const text = String(category).trim();
+  return text || t("pages-store.store.dishDetail.dash");
+});
 
 function goStorePage() {
   if (!storeId.value) return;
@@ -260,6 +248,12 @@ onLoad((options: any) => {
   }
 })
 
+onShow(() => {
+  if (userStore.isLogin && storeId.value) {
+    getCartInfo().then(() => loadRecommendDishes(true));
+  }
+})
+
 // 获取菜品详情
 const dishDetailData = ref<MerchantDishVo>(null);
 function getDishDetail(id: string) {
@@ -311,28 +305,345 @@ function handleShare() {
 
 const isSoldOut = computed(() => isSoldOutStock(dishDetailData.value?.stock))
 
+const specPopupVisible = ref(false)
+
+const hasSideDishes = computed(() => {
+  const list = dishDetailData.value?.merchantSideDishVoList ?? [];
+  return list.some(item => item.merchantSideDishItemVoList && item.merchantSideDishItemVoList.length > 0);
+})
+
+const appDisplayName = computed(() => {
+  const name = String((Config as any)?.appName ?? "").trim();
+  return name || "CHEFLINK";
+});
+
+function fillI18nParams(template: string, params: Record<string, string | number>) {
+  let text = template;
+  Object.keys(params).forEach((key) => {
+    const value = String(params[key] ?? "");
+    text = text.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+    text = text.replace(new RegExp(`\\$\\{${key}\\}`, "g"), value);
+  });
+  return text;
+}
+
+const memberPriceLabelText = computed(() =>
+  fillI18nParams(t("pages-store.store.dishDetail.memberPriceLabel"), {
+    name: appDisplayName.value,
+  })
+);
+
+function formatPriceText(val: unknown) {
+  const s = String(val ?? "").trim();
+  if (!/^\d+(\.\d+)?$/.test(s)) return "0";
+  const [intRaw, decRaw = ""] = s.split(".");
+  const intPart = intRaw.replace(/^0+(?=\d)/, "") || "0";
+  const decPart = decRaw.slice(0, 2).padEnd(2, "0");
+  return `${intPart}.${decPart}`
+    .replace(/\.00$/, "")
+    .replace(/(\.\d)0$/, "$1");
+}
+
+function priceToCentString(val: unknown) {
+  const normalized = String(formatPriceText(val));
+  if (normalized === "0") return "0";
+  const [intPart, decRaw = ""] = normalized.split(".");
+  const decPart = decRaw.padEnd(2, "0").slice(0, 2);
+  return `${intPart}${decPart}`.replace(/^0+(?=\d)/, "") || "0";
+}
+
+function centStringToPriceText(centsLike: string) {
+  const cents = centsLike.replace(/^0+(?=\d)/, "") || "0";
+  if (cents === "0") return "0";
+  const padded = cents.length >= 3 ? cents : cents.padStart(3, "0");
+  const intPart = padded.slice(0, -2).replace(/^0+(?=\d)/, "") || "0";
+  const decPart = padded.slice(-2);
+  return `${intPart}.${decPart}`
+    .replace(/\.00$/, "")
+    .replace(/(\.\d)0$/, "$1");
+}
+
+const specPopupDisplayPrice = computed(() => {
+  const dish = dishDetailData.value as any;
+  const sideList = dish?.merchantSideDishVoList ?? [];
+  for (const side of sideList) {
+    const selectedId = side?.selectedIds?.[0];
+    if (selectedId == null) continue;
+    const selectedItem = (side?.merchantSideDishItemVoList ?? []).find(
+      (opt: any) => String(opt?.id) === String(selectedId)
+    );
+    const selectedPriceCent = priceToCentString(selectedItem?.price);
+    if (selectedPriceCent !== "0") {
+      return centStringToPriceText(selectedPriceCent);
+    }
+  }
+
+  const memberCent = priceToCentString(dish?.memberPrice);
+  const baseCent =
+    userStore.isMember && memberCent !== "0"
+      ? memberCent
+      : priceToCentString(dish?.discountPrice);
+  return centStringToPriceText(baseCent);
+});
+
+function openSpecPopup() {
+  const sideList = dishDetailData.value?.merchantSideDishVoList ?? [];
+  for (const item of sideList) {
+    if (
+      (!item.selectedIds || item.selectedIds.length === 0) &&
+      item.merchantSideDishItemVoList &&
+      item.merchantSideDishItemVoList.length > 0
+    ) {
+      item.selectedIds = [item.merchantSideDishItemVoList[0].id];
+    }
+  }
+  specPopupVisible.value = true;
+}
+
+function onSpecConfirm() {
+  specPopupVisible.value = false;
+  addCart();
+}
+
 const cartDataList = ref<MerchantCartVo[]>([])
 function getCartInfo() {
-  if(!userStore.isLogin) return
-  appMerchantCartListByMerchantIdPost({
+  if (!userStore.isLogin || !storeId.value) {
+    cartDataList.value = []
+    return Promise.resolve()
+  }
+  return appMerchantCartListByMerchantIdPost({
     params: {
       merchantId: storeId.value,
     }
   }).then((res: any)=> {
     console.log('购物车列表', res)
-    cartDataList.value = res.data
+    cartDataList.value = res.data ?? []
   })
 }
 
-function navigateToCart() {
-  const name = storeDetail.value?.merchantName ?? "";
+const recommendDishes = ref<MerchantDishVo[]>([]);
+const addingRecommendId = ref<string | number | null>(null);
+
+/** 推荐区分页，每页条数（接口分页） */
+const RECOMMEND_PAGE_SIZE = 12;
+/** 首屏自动预拉：至少凑满条数（仍不足则继续翻页直到无更多或达上限） */
+const MIN_RECOMMEND_ITEMS = 6;
+/** 首屏自动翻页最多请求页数，防止异常死循环 */
+const MAX_AUTO_FETCH_PAGES = 5;
+/** 下一次要请求的页码（与 pages-store/store/index 菜品列表分页一致） */
+const recommendPageNum = ref(1);
+const recommendHasMore = ref(false);
+const recommendLoadingMore = ref(false);
+
+/** 兼容接口返回 rows 在 data 内或顶层 */
+function extractDishPageRows(res: unknown): MerchantDishVo[] {
+  const r = res as Record<string, any> | null | undefined;
+  if (!r) return [];
+  if (Array.isArray(r.rows)) return r.rows as MerchantDishVo[];
+  const d = r.data;
+  if (Array.isArray(d)) return d as MerchantDishVo[];
+  if (d && Array.isArray(d.rows)) return d.rows as MerchantDishVo[];
+  return [];
+}
+
+function filterRecommendRows(
+  rows: MerchantDishVo[],
+  did: string | number,
+  cartDishIds: Set<string>
+) {
+  return rows.filter(
+    (r: MerchantDishVo) =>
+      r && String(r.id) !== String(did) && !cartDishIds.has(String(r.id))
+  );
+}
+
+/** 列表项去重：跨店时同一 dishId 可能出现在不同店，用 id+merchantId */
+function recommendRowKey(r: MerchantDishVo) {
+  return `${String(r.id)}_${String(r.merchantId ?? "")}`;
+}
+
+/**
+ * 按菜谱分类跨店推荐（与 pages-store/pages/list 一致）；无分类 id 时回退附近菜品
+ */
+async function fetchRecommendPage(pageToFetch: number): Promise<MerchantDishVo[]> {
+  const dish = dishDetailData.value as any;
+  const rid =
+    dish?.recipeCategoryId != null && String(dish.recipeCategoryId).trim() !== ""
+      ? String(dish.recipeCategoryId)
+      : "";
+  if (rid) {
+    const res: any = await getDishListByCategoryId({
+      params: {
+        pageNum: pageToFetch,
+        pageSize: RECOMMEND_PAGE_SIZE,
+        recipeCategoryId: rid,
+      },
+      body: {
+        pageNum: pageToFetch,
+        pageSize: RECOMMEND_PAGE_SIZE,
+        lat: userStore.userLocation.latitude || undefined,
+        lng: userStore.userLocation.longitude || undefined,
+        recipeCategoryId: rid,
+        merchantCategoryIds: [],
+        merchantLabelIds: [],
+      },
+    });
+    return extractDishPageRows(res);
+  }
+  const res: any = await appMerchantDishNearbyListPost({
+    params: {
+      pageNum: pageToFetch,
+      pageSize: RECOMMEND_PAGE_SIZE,
+    },
+    body: {
+      lat: userStore.userLocation.latitude,
+      lng: userStore.userLocation.longitude,
+    } as any,
+  });
+  return extractDishPageRows(res);
+}
+
+/**
+ * @param reset 为 true 时从第一页重新拉取（切换菜品、购物车变化等）
+ */
+async function loadRecommendDishes(reset = true) {
+  const did = dishDetailData.value?.id;
+  if (!did) {
+    recommendDishes.value = [];
+    recommendHasMore.value = false;
+    recommendPageNum.value = 1;
+    return;
+  }
+  if (reset) {
+    recommendPageNum.value = 1;
+    recommendDishes.value = [];
+    recommendHasMore.value = false;
+  }
+  const cartDishIds = new Set<string>();
+  cartDataList.value.forEach((it: MerchantCartVo) => {
+    if (it.dishId != null) cartDishIds.add(String(it.dishId));
+  });
+  try {
+    const existing = new Set(recommendDishes.value.map((d) => recommendRowKey(d)));
+    const toAdd: MerchantDishVo[] = [];
+    let pageToFetch = reset ? 1 : recommendPageNum.value;
+    let lastGotFullPage = false;
+    // reset：自动连续请求第 2、3…页，直到凑够 MIN、或本页非满页、或达到页数上限
+    // !reset：仅请求一页（用户点击「加载更多」）
+    while (true) {
+      const pageRows = await fetchRecommendPage(pageToFetch);
+      lastGotFullPage = pageRows.length >= RECOMMEND_PAGE_SIZE;
+      const filtered = filterRecommendRows(pageRows, did, cartDishIds);
+      for (const r of filtered) {
+        if (!r?.id || existing.has(recommendRowKey(r))) continue;
+        existing.add(recommendRowKey(r));
+        toAdd.push(r);
+      }
+      if (!reset) {
+        break;
+      }
+      const reachedPageCap = pageToFetch >= MAX_AUTO_FETCH_PAGES;
+      if (
+        !lastGotFullPage ||
+        toAdd.length >= MIN_RECOMMEND_ITEMS ||
+        reachedPageCap
+      ) {
+        break;
+      }
+      pageToFetch += 1;
+    }
+    if (toAdd.length > 0) {
+      if (reset) {
+        recommendDishes.value = toAdd;
+      } else {
+        recommendDishes.value = [...recommendDishes.value, ...toAdd];
+      }
+    } else if (reset) {
+      recommendDishes.value = [];
+    }
+    recommendHasMore.value = lastGotFullPage;
+    recommendPageNum.value = lastGotFullPage ? pageToFetch + 1 : pageToFetch;
+  } catch (e) {
+    console.error(e);
+    if (reset) recommendDishes.value = [];
+    recommendHasMore.value = false;
+  }
+}
+
+async function loadMoreRecommendDishes() {
+  if (!recommendHasMore.value || recommendLoadingMore.value) return;
+  recommendLoadingMore.value = true;
+  try {
+    await loadRecommendDishes(false);
+  } finally {
+    recommendLoadingMore.value = false;
+  }
+}
+
+/** 页面滚动触底：与「加载更多」按钮同逻辑，避免只能点按钮才能翻页 */
+onReachBottom(() => {
+  if (!recommendHasMore.value || recommendLoadingMore.value) return;
+  loadMoreRecommendDishes();
+});
+
+watch(
+  () =>
+    [
+      dishDetailData.value?.id,
+      (dishDetailData.value as any)?.recipeCategoryId,
+      storeId.value,
+      cartDataList.value.length,
+    ] as const,
+  () => {
+    loadRecommendDishes(true);
+  },
+  { immediate: true }
+);
+
+function openDish(item: MerchantDishVo) {
+  if (!item?.id) return;
+  const sid = item.merchantId ?? storeId.value;
+  if (!sid) return;
   uni.navigateTo({
-    url:
-      "/pages-user/pages/cart/store-cart"
-      + "?storeId="
-      + storeId.value
-      + "&storeName="
-      + encodeURIComponent(name),
+    url: `/pages-store/pages/store/dishes?id=${item.id}&storeId=${sid}`,
+  });
+}
+
+function recommendAddKey(dish: MerchantDishVo) {
+  return `${String(dish.id)}_${String(dish.merchantId ?? "")}`;
+}
+
+async function addRecommendToCart(dish: MerchantDishVo) {
+  if (!userStore.isLogin) {
+    uni.showToast({ title: t("common.pleaseLogin"), icon: "none" });
+    setTimeout(() => uni.navigateTo({ url: Config.loginPath }), 400);
+    return;
+  }
+  const targetMerchantId = dish.merchantId ?? storeId.value;
+  if (!dish?.id || !targetMerchantId) return;
+  if (addingRecommendId.value != null) return;
+
+  addingRecommendId.value = recommendAddKey(dish);
+  try {
+    await appMerchantCartAddCartPost({
+      body: {
+        merchantId: targetMerchantId,
+        dishId: dish.id,
+        count: 1,
+        merchantCartSideDishBoList: [],
+      } as any,
+    });
+    uni.showToast({ title: t("toast.addCartSuccess"), icon: "none" });
+    await getCartInfo();
+    loadRecommendDishes(true);
+  } finally {
+    addingRecommendId.value = null;
+  }
+}
+
+function navigateToCart() {
+  uni.navigateTo({
+    url: "/pages-user/pages/cart/index",
   });
 }
 
@@ -474,7 +785,7 @@ function getStoreDetail() {
           >
             <text class="price-member__icon">◆</text>
             <text class="price-member__txt"
-              >{{ t("pages-store.store.dishDetail.memberPriceLabel", { name: Config.appName }) }}:
+              >{{ memberPriceLabelText }}:
               ${{ dishDetailData?.memberPrice }}</text
             >
           </view>
@@ -539,10 +850,10 @@ function getStoreDetail() {
           </view>
           <view class="spec-cell">
             <text class="spec-cell__val ellipsis">{{
-              dishDetailData?.dishName || t("pages-store.store.dishDetail.dash")
+              specCategoryDisplay
             }}</text>
             <text class="spec-cell__lbl">{{
-              t("pages-store.store.dishDetail.brand")
+              t("pages-store.store.dishDetail.category")
             }}</text>
           </view>
           <view class="spec-cell">
@@ -568,87 +879,52 @@ function getStoreDetail() {
 
       <view class="divider"></view>
 
-      <!-- 选择调料区域 -->
-      <view class="pb-240rpx">
-        <template
-          v-for="item in dishDetailData?.merchantSideDishVoList"
-          :key="item.id"
-        >
-          <view class="px-30rpx flex-center-sb mb-22rpx">
-            <view class="sauce-info">
-              <text class="sauce-title">{{ item.sideDishName }}</text>
-              <text class="sauce-subtitle mt-12rpx">{{ t('pages-store.store.choose') }}</text>
-            </view>
-            <view
-                v-if="isSideDishRequired(item)"
-                class="required-tag h-64rpx center shrink-0"
-                :class="[
-            item.selectedIds && item.selectedIds.length !== 0
-              ? 'bg-#00A76D/10 text-#00A76D font-500 !px-16rpx'
-              : 'bg-#f2f2f2 text-#333',
-          ]"
-            >
-              <image
-                  v-if="item.selectedIds && item.selectedIds.length !== 0"
-                  src="@img-store/1338.png"
-                  mode="aspectFill"
-                  class="w-28rpx h-28rpx shrink-0 mr-4rpx"
-              />
-              <text class="text-26rpx lh-26rpx">{{ t('pages-store.store.required') }}</text>
-            </view>
-          </view>
-          <!-- 调料选项列表 -->
-          <view class="mb-30rpx">
-            <view
-                v-for="(sauce, index) in item.merchantSideDishItemVoList"
-                :key="index"
-                class="sauce-option p-30rpx"
-                @click="selectSauce(item, sauce.id)"
-            >
-              <text class="sauce-name">{{ sauce.name }}</text>
-
-              <view class="flex items-center">
-                <text class="text-#00A76D mr-10rpx">+${{ sauce.price }}</text>
-                <!-- 单选按钮 -->
-                <image
-                    :src="
-              item.selectedIds && item.selectedIds.includes(sauce.id)
-                ? '/static/images/chef/133.png'
-                : '/static/images/chef/134.png'
-            "
-                    class="w-48rpx h-48rpx shrink-0"
-                    mode="aspectFit"
-                />
-              </view>
-            </view>
-          </view>
-        </template>
-      </view>
-
-      <!-- 为您推荐 -->
-      <view v-if="recommendDishes.length > 0" class="recommend-block">
-        <view class="recommend-pill">{{
-          t("pages-store.store.dishDetail.forYou")
+      <!-- 为您推荐（底部区域，与购物车同款样式与加购；支持分页加载更多） -->
+      <view
+        v-if="recommendDishes.length > 0 || recommendHasMore"
+        class="cart-recommend"
+      >
+        <view class="cart-recommend-pill">{{
+          t("pages-user.cart.forYou")
         }}</view>
-        <view class="recommend-grid">
+        <view v-if="recommendDishes.length > 0" class="cart-recommend-grid">
           <view
-            v-for="item in recommendDishes"
-            :key="item.id"
-            class="recommend-card"
-            @click="openDish(item)"
+            v-for="(dish, ri) in recommendDishes"
+            :key="`${dish.id}-${dish.merchantId ?? ''}-${ri}`"
+            class="cart-rec-card"
+            @click="openDish(dish)"
           >
             <image
-              class="recommend-card__img"
-              :src="item.dishImage?.split(',')[0] || item.dishImage || ''"
+              class="cart-rec-img"
+              :src="dish.dishImage?.split(',')[0] || dish.dishImage"
               mode="aspectFill"
             />
-            <text class="recommend-card__name ellipsis">{{ item.dishName }}</text>
-            <view class="recommend-card__price">
-              <text class="recommend-card__sym">$</text>
-              <text>{{ item.discountPrice }}</text>
+            <text class="cart-rec-name line-clamp-2">{{ dish.dishName }}</text>
+            <view class="cart-rec-bottom">
+              <text class="cart-rec-price">${{ dish.discountPrice }}</text>
+              <view
+                class="cart-rec-plus"
+                :class="{
+                  'cart-rec-plus--busy': addingRecommendId === recommendAddKey(dish),
+                }"
+                @click.stop="addRecommendToCart(dish)"
+                >+</view
+              >
             </view>
           </view>
         </view>
+        <view
+          v-if="recommendHasMore"
+          class="cart-recommend-more"
+          :class="{ 'cart-recommend-more--disabled': recommendLoadingMore }"
+          @click="loadMoreRecommendDishes"
+        >
+          <text class="cart-recommend-more__text">{{
+            recommendLoadingMore
+              ? t("common.loading")
+              : t("pages-store.store.dishDetail.loadMoreRecommend")
+          }}</text>
+        </view>
       </view>
 
       <view class="bottom-spacer-fab" :style="[configStore.iosSafeBottomPlaceholder]" />
@@ -666,7 +942,83 @@ function getStoreDetail() {
       </view>
     </view>
 
+    <!-- 规格选择弹窗 -->
+    <wd-popup
+      v-model="specPopupVisible"
+      position="bottom"
+      custom-style="border-radius: 24rpx 24rpx 0 0;"
+      @close="specPopupVisible = false"
+    >
+      <view class="spec-popup">
+        <!-- 头部：菜品信息 -->
+        <view class="spec-popup__header">
+          <image
+            class="spec-popup__img"
+            :src="dishImageList[0] || ''"
+            mode="aspectFill"
+          />
+          <view class="spec-popup__info">
+            <text class="spec-popup__name ellipsis">{{ dishDetailData?.dishName }}</text>
+            <view class="spec-popup__price">
+              <text class="spec-popup__sym">$</text>
+              <text class="spec-popup__num">{{ specPopupDisplayPrice }}</text>
+            </view>
+          </view>
+          <view class="spec-popup__close" @click="specPopupVisible = false">
+            <text class="spec-popup__close-icon">×</text>
+          </view>
+        </view>
 
+        <!-- 规格选项列表 -->
+        <scroll-view scroll-y class="spec-popup__body">
+          <template
+            v-for="item in dishDetailData?.merchantSideDishVoList"
+            :key="item.id"
+          >
+            <view
+              v-if="item.merchantSideDishItemVoList && item.merchantSideDishItemVoList.length > 0"
+              class="spec-popup__group"
+            >
+              <view class="spec-popup__group-header">
+                <text class="spec-popup__group-title">{{ item.sideDishName }}</text>
+                <!-- <view
+                  v-if="isSideDishRequired(item)"
+                  class="spec-popup__required-tag"
+                  :class="{ 'spec-popup__required-tag--done': item.selectedIds && item.selectedIds.length > 0 }"
+                >
+                  <image
+                    v-if="item.selectedIds && item.selectedIds.length > 0"
+                    src="@img-store/1338.png"
+                    mode="aspectFill"
+                    class="w-24rpx h-24rpx shrink-0 mr-4rpx"
+                  />
+                  <text class="text-24rpx">{{ t('pages-store.store.required') }}</text>
+                </view> -->
+              </view>
+              <view class="spec-popup__options">
+                <view
+                  v-for="sauce in item.merchantSideDishItemVoList"
+                  :key="sauce.id"
+                  class="spec-popup__option"
+                  :class="{ 'spec-popup__option--active': item.selectedIds && item.selectedIds.includes(sauce.id) }"
+                  @click="selectSauce(item, sauce.id)"
+                >
+                  <text class="spec-popup__option-name">{{ sauce.name }}</text>
+                </view>
+              </view>
+            </view>
+          </template>
+        </scroll-view>
+
+        <!-- 底部确认按钮 -->
+        <view class="spec-popup__footer">
+          <view class="spec-popup__confirm-btn" @click="onSpecConfirm">
+            <text class="spec-popup__confirm-text">{{ t('pages-store.store.addToCart') }}</text>
+          </view>
+        </view>
+        <view :style="[configStore.iosSafeBottomPlaceholder]" />
+      </view>
+    </wd-popup>
 
   </view>
   </view>
@@ -1029,102 +1381,105 @@ function getStoreDetail() {
   margin: 0 0 8rpx;
 }
 
-.sauce-info {
-  flex: 1;
+/* 与 pages-user/pages/cart 为您推荐一致 */
+.cart-recommend {
+  margin-top: 8rpx;
+  padding: 0 30rpx 32rpx;
 }
 
-.sauce-title {
-  font-size: 36rpx;
-  color: #333333;
-  font-weight: bold;
-  line-height: 40rpx;
-  margin-bottom: 8rpx;
-  display: block;
-}
-
-.sauce-subtitle {
-  font-size: 24rpx;
-  color: #7d7d7d;
-  line-height: 24rpx;
-  display: block;
-}
-
-.required-tag {
-  border-radius: 8rpx;
-  min-width: 150rpx;
-  text-align: center;
-}
-
-.sauce-option {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1rpx solid #dfdfdf;
-}
-
-.sauce-name {
-  font-size: 32rpx;
-  color: #333333;
-  font-weight: 500;
-  line-height: 32rpx;
-}
-
-.recommend-block {
-  padding: 8rpx 30rpx 48rpx;
-}
-
-.recommend-pill {
+.cart-recommend-pill {
   display: inline-block;
   padding: 12rpx 28rpx;
   border-radius: 999rpx;
-  background: #f2f2f2;
+  background: #eee;
   font-size: 26rpx;
   color: #333;
   font-weight: 500;
   margin-bottom: 24rpx;
 }
 
-.recommend-grid {
+.cart-recommend-grid {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  gap: 24rpx;
+  gap: 20rpx;
 }
 
-.recommend-card {
+.cart-rec-card {
   background: #fff;
-  border-radius: 16rpx;
+  border-radius: 20rpx;
   overflow: hidden;
-  border: 1rpx solid #f0f0f0;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
 }
 
-.recommend-card__img {
+.cart-rec-img {
   width: 100%;
   height: 220rpx;
   background: #f5f5f5;
 }
 
-.recommend-card__name {
+.cart-rec-name {
   display: block;
-  padding: 12rpx 16rpx 4rpx;
+  padding: 12rpx 16rpx 0;
   font-size: 26rpx;
   color: #333;
-  line-height: 1.3;
+  min-height: 72rpx;
 }
 
-.recommend-card__price {
-  padding: 0 16rpx 16rpx;
+.cart-rec-bottom {
+  padding: 12rpx 16rpx 16rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.cart-rec-price {
   font-size: 28rpx;
   font-weight: 600;
   color: #e02020;
 }
 
-.recommend-card__sym {
-  font-size: 22rpx;
-  margin-right: 2rpx;
+.cart-rec-plus {
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 50%;
+  background: #f2f2f2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333;
+}
+
+.cart-rec-plus--busy {
+  opacity: 0.45;
+  pointer-events: none;
+}
+
+.cart-recommend-more {
+  margin-top: 8rpx;
+  padding: 20rpx 0 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.cart-recommend-more__text {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #14181b;
+  padding: 16rpx 48rpx;
+  border-radius: 999rpx;
+  border: 1rpx solid #ddd;
+  background: #fff;
+}
+
+.cart-recommend-more--disabled .cart-recommend-more__text {
+  opacity: 0.5;
 }
 
 .bottom-spacer-fab {
-  height: 160rpx;
+  height: 240rpx;
   padding-bottom: constant(safe-area-inset-bottom);
   padding-bottom: env(safe-area-inset-bottom);
 }
@@ -1172,6 +1527,193 @@ function getStoreDetail() {
   letter-spacing: 0.02em;
 }
 
+/* 规格选择弹窗 */
+.spec-popup {
+  background: #fff;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  overflow-x: hidden;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.spec-popup__header {
+  display: flex;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  box-sizing: border-box;
+}
+
+.spec-popup__img {
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 16rpx;
+  flex-shrink: 0;
+  background: #f5f5f5;
+}
+
+.spec-popup__info {
+  flex: 1;
+  min-width: 0;
+  margin-left: 24rpx;
+  margin-right: 16rpx;
+}
+
+.spec-popup__name {
+  display: block;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  line-height: 1.4;
+  margin-bottom: 12rpx;
+}
+
+.spec-popup__price {
+  display: flex;
+  align-items: baseline;
+  color: #e02020;
+  font-weight: 600;
+}
+
+.spec-popup__sym {
+  font-size: 26rpx;
+  margin-right: 4rpx;
+}
+
+.spec-popup__num {
+  font-size: 40rpx;
+  line-height: 1;
+}
+
+.spec-popup__close {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #f2f2f2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.spec-popup__close-icon {
+  font-size: 36rpx;
+  color: #999;
+  line-height: 1;
+}
+
+.spec-popup__body {
+  flex: 1;
+  max-height: 50vh;
+  padding: 0 30rpx;
+  overflow-x: hidden;
+  box-sizing: border-box;
+}
+
+.spec-popup__group {
+  padding: 28rpx 0;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+
+.spec-popup__group:last-child {
+  border-bottom: none;
+}
+
+.spec-popup__group-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+
+.spec-popup__group-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.spec-popup__required-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 6rpx 16rpx;
+  border-radius: 8rpx;
+  background: #f2f2f2;
+  color: #666;
+}
+
+.spec-popup__required-tag--done {
+  background: #000;
+  color: #fff;
+  font-weight: 500;
+}
+
+.spec-popup__options {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  overflow: hidden;
+}
+
+.spec-popup__option {
+  display: flex;
+  align-items: center;
+  gap: 8rpx;
+  padding: 16rpx 28rpx;
+  border-radius: 20rpx;
+  background: #fff;
+  border: 2rpx solid #000;
+  color: #333;
+  font-weight: 500;
+  transition: all 0.2s;
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
+.spec-popup__option--active {
+  background: #000;
+  color: #fff;
+  border-color: #000;
+}
+
+.spec-popup__option-name {
+  font-size: 26rpx;
+  color: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.spec-popup__option-price {
+  font-size: 24rpx;
+  color: inherit;
+  flex-shrink: 0;
+  white-space: nowrap;
+  opacity: 0.7;
+}
+
+.spec-popup__footer {
+  padding: 20rpx 30rpx;
+}
+
+.spec-popup__confirm-btn {
+  width: 100%;
+  height: 96rpx;
+  border-radius: 48rpx;
+  background: #000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.spec-popup__confirm-text {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #fff;
+  letter-spacing: 0.02em;
+}
+
 </style>
 <style>
 page {
diff --git a/src/pages-store/pages/store/index.vue b/src/pages-store/pages/store/index.vue
index 14f525c..dd6b2be 100644
--- a/src/pages-store/pages/store/index.vue
+++ b/src/pages-store/pages/store/index.vue
@@ -423,10 +423,7 @@ function navigateBack() {
 
 function navigateToCart() {
   uni.navigateTo({
-    url:
-        '/pages-user/pages/cart/store-cart'
-        + '?storeId=' + storeID.value
-        + '&storeName=' + encodeURIComponent(storeDetail.value.merchantName),
+    url: '/pages-user/pages/cart/index',
   })
 }
 
diff --git a/src/pages-store/static/images/coupon-2.png b/src/pages-store/static/images/coupon-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd027a4f9ef7f8d8df68daa2ed0fa4f534b0bd65
GIT binary patch
literal 18579
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

literal 0
HcmV?d00001

diff --git a/src/pages-store/static/images/coupon-right-2.png b/src/pages-store/static/images/coupon-right-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..503be022c4e1e40efdf9b37be376a65d0042f4a2
GIT binary patch
literal 5719
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

literal 0
HcmV?d00001

diff --git a/src/pages-store/static/images/coupon-right.png b/src/pages-store/static/images/coupon-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aa40687055afe34f34cc19199758efe3585ff25
GIT binary patch
literal 5904
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
bb!YeAxZWOH!&qt1;)dw!nBYrsjyL`T5cm^O

literal 0
HcmV?d00001

diff --git a/src/pages-store/static/images/coupon.png b/src/pages-store/static/images/coupon.png
new file mode 100644
index 0000000000000000000000000000000000000000..af86aab4cbe67ddd8e801351ab45bf15904e27a7
GIT binary patch
literal 19366
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
MUMNTuis}3PKN@VNL;wH)

literal 0
HcmV?d00001

diff --git a/src/pages-user/pages/cart/components/remove-cart.vue b/src/pages-user/pages/cart/components/remove-cart.vue
index 7de1967..5d8b539 100644
--- a/src/pages-user/pages/cart/components/remove-cart.vue
+++ b/src/pages-user/pages/cart/components/remove-cart.vue
@@ -25,9 +25,9 @@ defineExpose({
       @close="handleClose"
   >
     <view class="px-30rpx text-#333 text-center pt-48rpx pb-60rpx">
-      <view class="text-40rpx lh-40rpx font-500">Delete shopping cart?</view>
+      <view class="text-40rpx lh-40rpx font-500">{{ t("pages-user.cart.removeCartTitle") }}</view>
       <view class="text-28rpx lh-28rpx mt-36rpx">
-        Are you sure you want to delete the shopping cart?
+        {{ t("pages-user.cart.removeCartDesc") }}
       </view>
       <view class="mt-70rpx">
         <wd-button @click="handleDelete" custom-class="!h-108rpx !bg-14181B !text-36rpx !lh-108rpx !text-#fff !rounded-16rpx" block>
diff --git a/src/pages-user/pages/cart/components/remove-store.vue b/src/pages-user/pages/cart/components/remove-store.vue
index 1eba605..35d83fc 100644
--- a/src/pages-user/pages/cart/components/remove-store.vue
+++ b/src/pages-user/pages/cart/components/remove-store.vue
@@ -4,6 +4,20 @@ const emit = defineEmits(['confirm','close'])
 
 const show = ref(false);
 const goodsName = ref('');
+
+function fillI18nParams(template: string, params: Record<string, string | number>) {
+  let text = template;
+  Object.keys(params).forEach((key) => {
+    const value = String(params[key] ?? "");
+    text = text.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+    text = text.replace(new RegExp(`\\$\\{${key}\\}`, "g"), value);
+  });
+  return text;
+}
+
+const removeProductDescText = computed(() =>
+  fillI18nParams(t("pages-user.cart.removeProductDesc"), { name: goodsName.value })
+);
 function onOpen(title: string) {
   if (title) {
     goodsName.value = title;
@@ -31,9 +45,9 @@ defineExpose({
       @close="handleClose"
   >
     <view class="px-30rpx text-#333 text-center pt-48rpx pb-60rpx">
-      <view class="text-40rpx lh-40rpx font-500">Remove the product?</view>
+      <view class="text-40rpx lh-40rpx font-500">{{ t("pages-user.cart.removeProductTitle") }}</view>
       <view class="text-28rpx lh-28rpx mt-36rpx">
-        Are you sure you want to remove {{ goodsName }} from your shopping cart?
+        {{ removeProductDescText }}
       </view>
       <view class="mt-70rpx">
         <wd-button @click="confirmRemove" custom-class="!h-108rpx !bg-14181B !text-36rpx !lh-108rpx !text-#fff !rounded-16rpx" block>
diff --git a/src/pages-user/pages/cart/index.vue b/src/pages-user/pages/cart/index.vue
index 76348e2..5ff6184 100644
--- a/src/pages-user/pages/cart/index.vue
+++ b/src/pages-user/pages/cart/index.vue
@@ -38,6 +38,9 @@ interface CartItem {
   merchantDishVo: any;
   sideDishList: any[];
   checked: boolean;
+  discountPrice: number;
+  originalPrice: number;
+  memberPrice: number;
 }
 
 interface CartMerchant {
@@ -66,6 +69,59 @@ const selectedCartItems = computed(() => {
 });
 
 const selectedCount = computed(() => selectedCartItems.value.length);
+const appDisplayName = computed(() => {
+  const name = String((Config as any)?.appName ?? "").trim();
+  return name || "CHEFLINK";
+});
+
+function fillI18nParams(template: string, params: Record<string, string | number>) {
+  let text = template;
+  Object.keys(params).forEach((key) => {
+    const value = String(params[key] ?? "");
+    text = text.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+    text = text.replace(new RegExp(`\\$\\{${key}\\}`, "g"), value);
+  });
+  return text;
+}
+
+function normalizePriceString(val: unknown) {
+  const s = String(val ?? "").trim();
+  if (!/^\d+(\.\d+)?$/.test(s)) return "0";
+  const [intRaw, decRaw = ""] = s.split(".");
+  const intPart = intRaw.replace(/^0+(?=\d)/, "") || "0";
+  const decPart = decRaw.slice(0, 2).padEnd(2, "0");
+  return `${intPart}.${decPart}`;
+}
+
+function priceToCentString(val: unknown) {
+  const normalized = normalizePriceString(val);
+  const [intPart, decPart = "00"] = normalized.split(".");
+  return `${intPart}${decPart}`.replace(/^0+(?=\d)/, "") || "0";
+}
+
+function formatPriceForView(val: unknown) {
+  const normalized = normalizePriceString(val);
+  return normalized.replace(/\.00$/, "").replace(/(\.\d)0$/, "$1");
+}
+
+function getCartLineDisplayPrice(item: CartItem) {
+  // const memberCent = priceToCentString(item?.memberPrice);
+  // console.log('memberCent', memberCent);
+  console.log('item?.memberPrice', item?.memberPrice);
+  console.log(userStore.userInfo.userMembershipVo, 'userStore.isMember');
+  if (userStore.userInfo.userMembershipVo!==null) {
+    return item?.memberPrice;
+  }
+  return item?.discountPrice;
+}
+
+function showCartLineOriginalPrice(item: CartItem) {
+  const originalCent = priceToCentString(item?.originalPrice);
+  const currentCent = userStore.userInfo.userMembershipVo!==null && priceToCentString(item?.memberPrice) !== "0"
+    ? priceToCentString(item?.memberPrice)
+    : priceToCentString(item?.discountPrice);
+  return originalCent !== "0" && originalCent !== currentCent;
+}
 
 const priceData = ref<
   Record<string, any> & {
@@ -100,6 +156,17 @@ const selectedGoodsSubtotal = computed(() => {
   return total.toFixed(2);
 });
 
+const deliveryUnifiedText = computed(() =>
+  fillI18nParams(t("pages-user.cart.deliveryUnified"), { name: appDisplayName.value })
+);
+
+const itemsTotalWithPriceText = computed(() =>
+  fillI18nParams(t("pages-user.cart.itemsTotalWithPrice"), {
+    count: priceData.value.totalQuantity ?? selectedItemQty.value,
+    amount: selectedGoodsSubtotal.value,
+  })
+);
+
 /** 与地址页、结算页一致：展示用户已保存预约日，无则展示今天（选时间会跳转 reservation-time 并写回接口） */
 const deliveryScheduleLabel = computed(() => {
   const ap = userStore.appointmentTime as any;
@@ -210,7 +277,7 @@ function confirmRemove() {
     getCartList();
     uni.showToast({
       icon: "none",
-      title: "删除成功",
+      title: t("toast.deleteSuccess"),
     });
   });
 }
@@ -324,23 +391,18 @@ function scheduleCartUpdate(item: CartItem, targetValue: number) {
   pendingUpdateTimers.set(key, timer);
 }
 
-function normalizeInputNumberValue(payload: any): number {
-  if (typeof payload === "number") return payload;
-  if (payload && typeof payload === "object") {
-    if (typeof payload.detail?.value === "number")
-      return payload.detail.value;
-    if (typeof payload.value === "number") return payload.value;
-  }
-  const numeric = Number(payload);
-  return Number.isNaN(numeric) ? 0 : numeric;
+/** wd-input-number change 为 { value }，兼容 detail.value */
+function normalizeInputNumberValue(payload: unknown): number {
+  const raw =
+    typeof payload === "number"
+      ? payload
+      : (payload as any)?.value ?? (payload as any)?.detail?.value ?? payload;
+  const n = Number(raw);
+  return Number.isFinite(n) ? n : 0;
 }
 
 const delItemData = ref<CartItem | null>(null);
 
-function onItemQtyChange(item: CartItem) {
-  return (payload: unknown) => handleQuantityChange(payload, item);
-}
-
 function handleQuantityChange(payload: any, item: CartItem) {
   if (!item) return;
   const nextValue = normalizeInputNumberValue(payload);
@@ -593,9 +655,7 @@ async function getCartList() {
                     t("pages-user.cart.localDelivery")
                   }}</text>
                   <text class="cart-delivery-sub">{{
-                    t("pages-user.cart.deliveryUnified", {
-                      name: Config.appName,
-                    })
+                    deliveryUnifiedText
                   }}</text>
                 </view>
               </view>
@@ -607,11 +667,7 @@ async function getCartList() {
                 </view>
                 <view class="cart-price-summary">
                   <text class="cart-summary-line1">{{
-                    t("pages-user.cart.itemsTotalWithPrice", {
-                      count:
-                        priceData.totalQuantity ?? selectedItemQty,
-                      amount: selectedGoodsSubtotal,
-                    })
+                    itemsTotalWithPriceText
                   }}</text>
                   <view
                     v-if="
@@ -731,26 +787,22 @@ async function getCartList() {
                     <text class="mr-6rpx">{{
                       dish?.merchantSideDishItemVo?.name || ""
                     }}</text>
-                    <text
+                    <!-- <text
                       v-if="dish?.merchantSideDishItemVo?.price"
                       class="text-[#00A76D] mr-10rpx"
-                      >+${{ dish?.merchantSideDishItemVo?.price }}</text
-                    >
+                      >${{ dish?.merchantSideDishItemVo?.price }}</text
+                    > -->
                   </view>
                 </view>
                 <view class="cart-line-price-row">
                   <view class="flex items-baseline flex-wrap">
                     <text class="cart-line-price"
-                      >${{ item.merchantDishVo?.discountPrice }}</text
+                      >${{ getCartLineDisplayPrice(item) }}</text
                     >
                     <text
-                      v-if="
-                        item.merchantDishVo?.originalPrice &&
-                        item.merchantDishVo?.originalPrice !==
-                          item.merchantDishVo?.discountPrice
-                      "
+                      v-if="showCartLineOriginalPrice(item)"
                       class="cart-line-price-old"
-                      >${{ item.merchantDishVo?.originalPrice }}</text
+                      >${{ item?.originalPrice }}</text
                     >
                   </view>
                   <wd-input-number
@@ -761,7 +813,7 @@ async function getCartList() {
                     :input-width="72"
                     button-size="52"
                     custom-class="cart-qty-input"
-                    @change="onItemQtyChange(item)"
+                    @change="(e) => handleQuantityChange(e, item)"
                   />
                 </view>
               </view>
@@ -809,12 +861,12 @@ async function getCartList() {
         <template v-else>
           <view class="flex flex-col items-center justify-center py-100rpx">
             <image src="@img/chef/100.png" class="w-318rpx h-318rpx" />
-            <text class="text-32rpx text-[#7D7D7D]">Your cart is empty</text>
+            <text class="text-32rpx text-[#7D7D7D]">{{ t("pages-user.cart.emptyTitle") }}</text>
             <view
               class="mt-60rpx w-400rpx h-88rpx rounded-16rpx bg-[#14181B] flex items-center justify-center"
               @click="goToHome"
             >
-              <text class="text-30rpx text-white">Explore Restaurants</text>
+              <text class="text-30rpx text-white">{{ t("pages-user.cart.emptyAction") }}</text>
             </view>
           </view>
         </template>
diff --git a/src/pages-user/pages/cart/store-cart.vue b/src/pages-user/pages/cart/store-cart.vue
index 1c7b925..b65b7f0 100644
--- a/src/pages-user/pages/cart/store-cart.vue
+++ b/src/pages-user/pages/cart/store-cart.vue
@@ -115,20 +115,14 @@ function scheduleCartUpdate(item: MerchantCartVo, targetValue: number) {
   pendingUpdateTimers.set(key, timer)
 }
 
-function normalizeInputNumberValue(payload: any): number {
-  if (typeof payload === 'number') {
-    return payload
-  }
-  if (payload && typeof payload === 'object') {
-    if (typeof payload.detail?.value === 'number') {
-      return payload.detail.value
-    }
-    if (typeof payload.value === 'number') {
-      return payload.value
-    }
-  }
-  const numeric = Number(payload)
-  return Number.isNaN(numeric) ? 0 : numeric
+/** wd-input-number change 为 { value }，兼容 detail.value */
+function normalizeInputNumberValue(payload: unknown): number {
+  const raw =
+    typeof payload === "number"
+      ? payload
+      : (payload as any)?.value ?? (payload as any)?.detail?.value ?? payload;
+  const n = Number(raw);
+  return Number.isFinite(n) ? n : 0;
 }
 
 const delItemData = ref<MerchantCartVo | null>(null)
@@ -247,6 +241,18 @@ function appMerchantCartCalculateSavings() {
   })
 }
 
+function getCartItemDiscountPrice(item: MerchantCartVo) {
+  return item.discountPrice ?? item.merchantDishVo?.discountPrice
+}
+
+function getCartItemOriginalPrice(item: MerchantCartVo) {
+  return item.originalPrice ?? item.merchantDishVo?.originalPrice
+}
+
+function getCartItemMemberPrice(item: MerchantCartVo) {
+  return item.memberPrice ?? item.merchantDishVo?.memberPrice
+}
+
 function navigateTo(url: string) {
   uni.navigateTo({ url })
 }
@@ -301,21 +307,21 @@ function navigateTo(url: string) {
 
           <view class="price-row flex items-center mt-18rpx">
             <text class="current-price text-[#333333] text-30rpx font-normal"
-            >${{ item.merchantDishVo.discountPrice }}</text
+            >${{ getCartItemDiscountPrice(item) }}</text
             >
             <text
-                v-if="item.merchantDishVo.originalPrice"
+                v-if="getCartItemOriginalPrice(item)"
                 class="original-price text-[#7D7D7D] text-24rpx font-normal line-through ml-10rpx"
-            >${{ item.merchantDishVo.originalPrice }}</text
+            >${{ getCartItemOriginalPrice(item) }}</text
             >
 
             <!-- 会员价标签 -->
             <view
-                v-if="Number(item.merchantDishVo.memberPrice) > 0"
+                v-if="Number(getCartItemMemberPrice(item)) > 0"
                 class="member-price-tag ml-10rpx center pl-16rpx pr-6rpx pb-2rpx"
             >
               <text class="text-[#FBE3C3] text-20rpx"
-              >{{ t('pages-store.store.members') }}: ${{ item.merchantDishVo.memberPrice }}</text
+              >{{ t('pages-store.store.members') }}: ${{ getCartItemMemberPrice(item) }}</text
               >
             </view>
           </view>
diff --git a/src/pages.json b/src/pages.json
index 5529b9b..095ba79 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -229,7 +229,10 @@
           "path": "pages/store/search/result"
         },
         {
-          "path": "pages/store/dishes"
+          "path": "pages/store/dishes",
+          "style": {
+            "onReachBottomDistance": 80
+          }
         },
         {
           "path": "pages/order/checkout"
diff --git a/src/pages/home/components/tabbar-home/components/featured-on/index.vue b/src/pages/home/components/tabbar-home/components/featured-on/index.vue
index 57dd1fb..3f29aaa 100644
--- a/src/pages/home/components/tabbar-home/components/featured-on/index.vue
+++ b/src/pages/home/components/tabbar-home/components/featured-on/index.vue
@@ -81,11 +81,6 @@ function subtitleLine(item: any): string {
               class="featured-card__media-half featured-card__media-half--top"
               mode="aspectFill"
             />
-            <image
-              :src="getCardImages(item)[1]"
-              class="featured-card__media-half featured-card__media-half--bottom"
-              mode="aspectFill"
-            />
           </template>
           <image
             v-else-if="getCardImages(item).length >= 1"
@@ -154,6 +149,7 @@ function subtitleLine(item: any): string {
   display: flex;
   flex-direction: row;
   width: 620rpx;
+  height: 256rpx;
   min-height: 256rpx;
   margin-left: 16rpx;
   background: #fff;
@@ -171,18 +167,22 @@ function subtitleLine(item: any): string {
   background: #f0f0f0;
   display: flex;
   flex-direction: column;
+  position: relative;
+  overflow: hidden;
 }
 
 .featured-card__media-single {
   width: 100%;
   height: 100%;
   min-height: 256rpx;
+  display: block;
 }
 
 .featured-card__media-half {
   width: 100%;
   flex: 1;
   min-height: 0;
+  display: block;
 }
 .featured-card__media-half--top {
   border-bottom: 3rpx solid #fff;
diff --git a/src/pages/home/components/tabbar-home/tabbar-home.vue b/src/pages/home/components/tabbar-home/tabbar-home.vue
index 43942b2..507d7c0 100644
--- a/src/pages/home/components/tabbar-home/tabbar-home.vue
+++ b/src/pages/home/components/tabbar-home/tabbar-home.vue
@@ -446,10 +446,10 @@ const debouncedEmit = debounce(1300, (isCollected: boolean, id: string, type: Co
                   <view class="featured-dish-meta flex items-start justify-between gap-12rpx mb-14rpx">
                     <view class="min-w-0 flex-1">
                       <text class="featured-dish-price">US${{ item?.discountPrice }}</text>
-                      <text
+                      <!-- <text
                         v-if="Number(item?.originalPrice) > Number(item?.discountPrice)"
                         class="featured-dish-original"
-                      >US${{ item?.originalPrice }}</text>
+                      >US${{ item?.originalPrice }}</text> -->
                     </view>
                     <text class="featured-dish-sales shrink-0">{{ t('pages-store.store.sales') }}: {{ formatSalesCount(item?.salesCount) }}</text>
                   </view>
diff --git a/src/pages/home/components/tabbar-mine/components/invite-poster/invite-poster.vue b/src/pages/home/components/tabbar-mine/components/invite-poster/invite-poster.vue
index 612d274..58a466b 100644
--- a/src/pages/home/components/tabbar-mine/components/invite-poster/invite-poster.vue
+++ b/src/pages/home/components/tabbar-mine/components/invite-poster/invite-poster.vue
@@ -194,7 +194,7 @@ const poster = computed(() => ({
                   type: 'view',
                 },
                 {
-                  text:  'http://192.168.5.118:8091/#/'+ `pages-login/pages/sign-up/index?invitationCode=${userStore.userInfo.invitationCode}`,
+                  text:  'http://www.howhowfresh.com/h5/'+ `pages-login/pages/sign-up/index?invitationCode=${userStore.userInfo.invitationCode}`,
                   type: 'qrcode',
                   css: {
                     width: '124rpx',
diff --git a/src/pages/home/components/tabbar-mine/components/invite-user/invite-user.vue b/src/pages/home/components/tabbar-mine/components/invite-user/invite-user.vue
index b76ca27..62d16a2 100644
--- a/src/pages/home/components/tabbar-mine/components/invite-user/invite-user.vue
+++ b/src/pages/home/components/tabbar-mine/components/invite-user/invite-user.vue
@@ -83,7 +83,7 @@ defineExpose({
             </view>
             <view class="shrink-0 ml-20rpx" v-if="userStore.userInfo.invitationCode">
               <uqrcode ref="uqrcode" canvas-id="qrcode"
-                       :value="'http://192.168.5.118:8091/#/' + `pages-login/pages/sign-up/index?invitationCode=${userStore.userInfo.invitationCode}`"
+                       :value="'http://www.howhowfresh.com/h5/' + `pages-login/pages/sign-up/index?invitationCode=${userStore.userInfo.invitationCode}`"
                        :size="124"
                        sizeUnit="rpx"
                        :options="{}"></uqrcode>