From 8dd3f58fa4335eeb74602b1a867e4ec7937de333 Mon Sep 17 00:00:00 2001
From: ctw <ctw@email.com>
Date: Mon, 3 Nov 2025 16:12:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/product-sku.vue                |  9 ++---
 src/pages/prosperity-shop/goods-detail.vue    |  4 +--
 src/pages/prosperity-shop/goods-search.vue    | 15 ++++++++
 src/pages/prosperity-shop/settlement.vue      | 35 ++++++++++---------
 src/pages/prosperity-shop/shop-detail.vue     | 16 ++++-----
 src/pages/tabbar/prosperityShop.vue           | 16 ++++-----
 6 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/pages/prosperity-shop/components/product-sku.vue b/src/pages/prosperity-shop/components/product-sku.vue
index 2bffc13..5af3647 100644
--- a/src/pages/prosperity-shop/components/product-sku.vue
+++ b/src/pages/prosperity-shop/components/product-sku.vue
@@ -18,11 +18,7 @@
 					<view class="second-text-26">库存 {{ state.selectedSku.stock || 0 }}</view>
 					<view class="second-text-26">
 						已选择
-						{{
-							`${state.selectedSku.skuName || "未选择"} / ${
-								state.selectedSku.weightG ? state.selectedSku.weightG + "克" : "未选择"
-							}，数量 ${state.goodsCount}`
-						}}
+						{{ `${state.selectedSku.skuName || "未选择"}，购买数量 ${state.goodsCount}` }}
 					</view>
 				</view>
 			</view>
@@ -34,7 +30,7 @@
 			<view class="flex flex-wrap">
 				<view
 					class="text-center rounded-2 mr-4 mb-2 py-2 px-3 text-28 bg-#F2F2F2 c-black border border-solid border-#E5E5E5"
-					:class="{ 'bg-#0094ff! c-white!': state.selectedSku.id === v.id }"
+					:class="{ 'bg-#0094ff! c-white!': state.selectedSku.id === v.id && state.selectedSku.status === 0 }"
 					v-for="v in goodsInfo.skuList"
 					:key="v.id"
 					@click="onSelectSku(v)"
@@ -60,6 +56,7 @@
 				</view>
 			</view>
 		</view>
+		<view class="h-20rpx"></view>
 
 		<template #footer>
 			<button
diff --git a/src/pages/prosperity-shop/goods-detail.vue b/src/pages/prosperity-shop/goods-detail.vue
index 85154cf..9b88e51 100644
--- a/src/pages/prosperity-shop/goods-detail.vue
+++ b/src/pages/prosperity-shop/goods-detail.vue
@@ -30,8 +30,8 @@
 			<view class="second-text-26 mt-1">售卖时间 {{ goodsDetail.saleStartTime }} ~ {{ goodsDetail.saleEndTime }}</view>
 			<view class="second-text-26 truncate mt-1 flex justify-between items-center">
 				<view>
-					<text class="mr-20rpx">售卖单位 {{ goodsDetail.unit }}</text>
-					<text class="mr-20rpx">剩余库存 {{ goodsDetail.totalStock }}</text>
+					<!-- <text class="mr-20rpx">售卖单位 {{ goodsDetail.unit }}</text> -->
+					<text class="mr-20rpx">剩余总库存 {{ goodsDetail.totalStock }}</text>
 				</view>
 				<view class="second-text-24 px-2 py-8rpx bg-#0094ff c-white! border-rd-8" @tap.stop="state.showSkuDialog = true">加入购物车</view>
 			</view>
diff --git a/src/pages/prosperity-shop/goods-search.vue b/src/pages/prosperity-shop/goods-search.vue
index cff583f..87d5b40 100644
--- a/src/pages/prosperity-shop/goods-search.vue
+++ b/src/pages/prosperity-shop/goods-search.vue
@@ -114,3 +114,18 @@ const doGoodsDetail = (id: string) => {
 	})
 }
 </script>
+
+<style scoped>
+.view-clip {
+	position: relative;
+	&::before {
+		content: "";
+		position: absolute;
+		left: -18rpx;
+		bottom: 0rpx;
+		width: 20rpx;
+		height: 20rpx;
+		background: radial-gradient(circle at 0 0, transparent 80%, red 0);
+	}
+}
+</style>
diff --git a/src/pages/prosperity-shop/settlement.vue b/src/pages/prosperity-shop/settlement.vue
index 8aa9acc..f10d944 100644
--- a/src/pages/prosperity-shop/settlement.vue
+++ b/src/pages/prosperity-shop/settlement.vue
@@ -6,7 +6,7 @@
 		<tm-sticky-header>
 			<view class="h-20rpx" />
 			<view class="card p-20rpx">
-				<view class="text-36rpx mb-2">请选择自提点</view>
+				<view class="prefix_title text-36rpx mb-2">自提点</view>
 				<view class="flex-row items-center justify-between" @click="onPickupPoint">
 					<view v-if="curPickup.id" class="sub-text-30 mb-2 flex items-center">
 						<image class="size-80rpx rounded-1 mr-2" :src="filePath(curPickup.logo)" />
@@ -16,7 +16,7 @@
 						</view>
 					</view>
 					<view v-else class="sub-text-30 mb-2">请选择自提点</view>
-					<view class="flex-row items-center second-text-24">
+					<view class="flex-row items-center second-text-28 my-3">
 						<text>请选择自提点</text>
 						<text class="ml-10rpx color-#b1b1b1 iconfont icon-xiangxiajiantouxiao" />
 					</view>
@@ -26,9 +26,10 @@
 			<view class="h-20rpx" />
 		</tm-sticky-header>
 
-		<view class="card p-20rpx mb-20rpx mx-1">
-			<view v-if="totalCount > 0" class="flex-row px-15rpx mb-20rpx" v-for="(v, i) in cartList" :key="i">
-				<image class="size-125rpx rounded-12rpx mr-20rpx bg-#eeeeee" :src="filePath(v.productPic)" mode="aspectFill" />
+		<view class="card p-20rpx mb-20rpx">
+			<view class="prefix_title text-36rpx mb-2">我的购买</view>
+			<view v-if="totalCount > 0" class="flex-row mb-20rpx" v-for="(v, i) in cartList" :key="i">
+				<image class="size-140rpx rounded-12rpx mr-20rpx bg-#eeeeee" :src="filePath(v.productPic)" mode="aspectFill" />
 				<view class="flex-1 overflow-hidden">
 					<view class="sub-text-30 truncate">{{ v.productName }}</view>
 					<view class="flex justify-between items-center">
@@ -40,7 +41,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-else class="text-center second-text-28 py-20">你尚未选择任何商品</view>
+			<view v-else class="text-center second-text-28 py-40">您尚未选择任何商品</view>
 		</view>
 		<view class="h-20rpx" />
 
@@ -55,10 +56,10 @@
 		</template>
 	</crud-layout>
 
-	<tm-drawer v-model:show="state.showDrawer" title="自提点" :showClose="true" :showFooter="false" size="98%" bgColor="#F3FAFF">
+	<tm-drawer v-model:show="state.showDrawer" title="选择自提点" :showClose="true" :showFooter="false" size="86%" bgColor="#F3FAFF">
 		<z-paging
 			ref="pageRef"
-			height="98%"
+			height="100%"
 			v-model="pageHook.list"
 			:default-page-size="10"
 			safe-area-inset-bottom
@@ -67,12 +68,13 @@
 			:auto-clean-list-when-reload="false"
 			:auto-scroll-to-top-when-reload="false"
 			@scroll="pageHook.scroll"
+			:show-loading-more-no-more-view="false"
 		>
 			<view class="h-100rpx"></view>
 			<tm-radio-group v-model="state.curPickupId" direction="column" @change="radioChange">
-				<tm-radio v-for="(v, i) in pageHook.list" :key="i" class="w-full h-full px-2" :value="v.id">
-					<template v-slot:label="checked">
-						<view class="card p-2">
+				<view class="card p-2">
+					<tm-radio v-for="(v, i) in pageHook.list" :key="i" class="w-full h-full px-2" :value="v.id">
+						<template v-slot:label="checked">
 							<view class="flex items-center mb-1">
 								<image class="size-140rpx rounded-12rpx mr-2" :src="filePath(v.logo)" mode="aspectFill" />
 								<view class="flex-1 overflow-hidden">
@@ -85,8 +87,8 @@
 									</view>
 								</view>
 							</view>
-							<tm-text class="mx-2.5 mb-1">地址：{{ v.detailAddress }}</tm-text>
-							<tm-collapse @click.stop>
+							<tm-text class="mx-2.5 mb-1">地址：{{ v.detailAddress || "暂无" }}</tm-text>
+							<tm-collapse v-if="v.introduction" @click.stop>
 								<tm-collapse-item :name="i" title="简介" titleFontSize="28" activeColor="#000" titleHeight="40" :showBottomLine="false">
 									<tm-text>{{ v.introduction }}</tm-text>
 									<template #right>
@@ -94,9 +96,10 @@
 									</template>
 								</tm-collapse-item>
 							</tm-collapse>
-						</view>
-					</template>
-				</tm-radio>
+							<view class="my-2 h-1rpx bg-#A0A0A066"></view>
+						</template>
+					</tm-radio>
+				</view>
 			</tm-radio-group>
 		</z-paging>
 	</tm-drawer>
diff --git a/src/pages/prosperity-shop/shop-detail.vue b/src/pages/prosperity-shop/shop-detail.vue
index 283fa0f..7f33ccd 100644
--- a/src/pages/prosperity-shop/shop-detail.vue
+++ b/src/pages/prosperity-shop/shop-detail.vue
@@ -13,15 +13,15 @@
 			<text v-if="scrollDetail.scrollTop > 30" class="bg-#eeeeee44 whitespace-nowrap overflow-hidden second-text-26 ml-2">搜索商品</text>
 		</view>
 
-		<view v-if="mchDetail.id" class="card p-20rpx mt-10rpx mx-20rpx">
+		<view v-if="mchDetail.id" class="card p-20rpx mt-10rpx mx-20rpx bg-gradient-to-b from-#0094ff33 to-#fff">
 			<view class="w-full sub-text-32 truncate">{{ mchDetail.name }}</view>
 			<text class="sub-text-24 c-#0094ff! px-2 bg-#0094ff22 rounded-2 mr-4">营业</text>
-			<text class="second-text-24 truncate mt-1">营业人{{ mchDetail.contactName }} · {{ mchDetail.contactPhone }}</text>
+			<text class="second-text-24 truncate mt-1">营业人{{ mchDetail.contactName }} · {{ mchDetail.contactPhone || "无" }}</text>
 			<view class="second-text-26 mt-1">
-				<image class="w-24rpx h-24rpx mr-1" src="@/static/page/address.svg" />
-				<text>{{ mchDetail.address }}</text>
+				<image class="w-24rpx h-24rpx mr-2" src="@/static/page/address.svg" />
+				<text>{{ mchDetail.address || "暂无" }}</text>
 			</view>
-			<marquee class="second-text-24 mt-1">{{ mchDetail.remark }}</marquee>
+			<!-- <marquee class="second-text-24 mt-1">{{ mchDetail.remark }}</marquee> -->
 		</view>
 
 		<view class="flex mt-2">
@@ -42,16 +42,16 @@
 				class="flex-1 overflow-hidden pb-20rpx flex"
 				style="height: calc(100vh - 420rpx)"
 			>
-				<view v-for="v in state.goodsList" :key="v.id" class="card flex mx-15rpx mb-2 p-2" @click="doGoodsDetail(v.id)">
+				<view v-for="v in state.goodsList" :key="v.id" class="card flex mx-15rpx mb-2 p-1" @click="doGoodsDetail(v.id)">
 					<image :src="filePath(v.coverImage)" class="size-170rpx rounded-12rpx bg-#eeeeee" mode="aspectFill" />
 					<view class="flex-1 ml-2 overflow-hidden">
 						<view class="truncate sub-text-30">{{ v.title }}</view>
 						<view>
-							<text class="c-#0094ff! sub-text-24 px-2 bg-#0094ff22 rounded-2">{{ v.status == "0" ? "在售" : "未售" }}</text>
+							<text class="c-#0094ff! sub-text-24 px-2 bg-#0094ff22 rounded-2">{{ v.status == "0" ? "在售" : "已停售" }}</text>
 						</view>
 						<view>
-							<text class="second-text-26 mr-2">单位 {{ v.unit }}</text>
 							<text class="second-text-26">库存 {{ v.totalStock }}</text>
+							<!-- <text class="second-text-26 mr-2">单位 {{ v.unit }}</text> -->
 						</view>
 						<view class="flex items-center justify-between">
 							<view class="flex items-center">
diff --git a/src/pages/tabbar/prosperityShop.vue b/src/pages/tabbar/prosperityShop.vue
index 0401e00..4316353 100644
--- a/src/pages/tabbar/prosperityShop.vue
+++ b/src/pages/tabbar/prosperityShop.vue
@@ -63,36 +63,36 @@
 						<view class="second-text-26 flex justify-between my-6rpx">
 							<view>
 								<image class="w-24rpx h-24rpx mr-1" src="@/static/page/phone.svg" />
-								<text @tap.stop="doPhone(v.contactPhone)">{{ v.contactPhone }}</text>
+								<text @tap.stop="doPhone(v.contactPhone)">{{ v.contactPhone || "暂无" }}</text>
 							</view>
 							<text class="c-#0094ff! sub-text-26 px-2 bg-#0094ff22 rounded-2">营业</text>
 						</view>
 						<view class="second-text-26">
 							<image class="w-24rpx h-24rpx mr-1" src="@/static/page/address.svg" />
-							<text>{{ v.address }}</text>
+							<text>{{ v.address || "暂无" }}</text>
 						</view>
 					</view>
 				</view>
 				<scroll-view scroll-x>
 					<view class="flex mt-2">
-						<view class="w-160rpx flex-col items-center mr-20rpx" v-for="(pV, pI) in v.featuredProducts" :key="pI">
-							<image class="w-160rpx h-160rpx rounded-12rpx bg-#eeeeee" :src="filePath(pV.coverImage)" mode="aspectFill" />
+						<view class="w-180rpx flex-col items-center mr-20rpx" v-for="(pV, pI) in v.featuredProducts" :key="pI">
+							<image class="size-180rpx rounded-12rpx bg-#eeeeee" :src="filePath(pV.coverImage)" mode="aspectFill" />
 							<view class="w-full mt-4rpx sub-text-24 truncate">{{ pV.title }}</view>
 							<view class="w-full flex justify-between">
-								<text class="main-text-26 color-red!">
+								<text class="text-26 color-red!">
 									<text class="text-22rpx">¥</text>
 									<text>{{ pV.priceType == "1" ? displayPrice(pV.minPrice, "") : displayPrice(pV.spuPrice, "") }}</text>
 								</text>
-								<text class="second-text-24 line-through">
+								<!-- <text class="second-text-24 line-through">
 									<template v-if="pV.priceType == '2'">
 										<text class="text-22rpx">¥</text>
 										<text>{{ displayPrice(pV.originalPrice, "") }}</text>
 									</template>
-								</text>
+								</text> -->
 							</view>
 							<view class="w-full flex justify-between second-text-24">
-								<text>{{ pV.unit || "" }}</text>
 								<text>库存{{ pV.totalStock }}</text>
+								<text>{{ pV.status ? "已停售" : "在售" }}</text>
 							</view>
 						</view>
 					</view>