From dd307db990555c049941c41b1c7c5c3348f2b26c Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Fri, 10 Oct 2025 18:06:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=8F=8A?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复商品详情页支付状态显示逻辑，调整二维码页面样式和图片模式
修改环境配置为本地开发环境，优化富文本内容显示组件
---
 config.js                                          |  2 +-
 pages_order/article/index.vue                      | 32 +++++++++++++---------
 .../components/list/gourmet/productSelectList.vue  |  8 ++++--
 pages_order/gourmet/gourmetDetail.vue              |  1 +
 pages_order/gourmet/qrCode.vue                     | 14 ++++------
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/config.js b/config.js
index 7017a57..752d6ee 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'prod'
+const type = 'local'
 
 
 // 环境配置
diff --git a/pages_order/article/index.vue b/pages_order/article/index.vue
index 79d3fd4..0d600f3 100644
--- a/pages_order/article/index.vue
+++ b/pages_order/article/index.vue
@@ -15,11 +15,16 @@
 					<text class="create-time">{{ formatTime(articleDetail.createTime) }}</text>
 				</view>
 				
-				<!-- 富文本内容 -->
-				<view class="article-content">
-					<rich-text :nodes="articleDetail.content"></rich-text>
-				</view>
+			<!-- 富文本内容 -->
+			<view class="article-content">
+				<uv-parse
+					:content="articleDetail.content"
+					:preview-img="true"
+					:scroll-table="true"
+					:tag-style="parseTagStyle"
+				/>
 			</view>
+		</view>
 			
 			<!-- 错误状态 -->
 			<view class="error-container" v-if="!loading && !articleDetail">
@@ -50,6 +55,13 @@
 					orderId : '',
 					name : '',
                 }
+				,
+				// uv-parse 标签默认样式，确保图片不超过容器宽度
+				parseTagStyle: {
+					img: 'max-width:100%;height:auto;display:block;',
+					video: 'max-width:100%;height:auto;display:block;',
+					table: 'width:100%;display:block;'
+				}
 			}
 		},
 		onLoad(options) {
@@ -169,17 +181,11 @@
 	line-height: 1.6;
 	
 	// 富文本内容样式
-	:deep(rich-text) {
+	:deep(.uv-parse) {
 		font-size: 30rpx;
 		color: #333;
-		
-		// 图片样式
-		img {
-			max-width: 100%;
-			height: auto;
-			border-radius: 8rpx;
-			margin: 20rpx 0;
-		}
+
+		// 图片样式由 uv-parse 的 tag-style 控制
 		
 		// 段落样式
 		p {
diff --git a/pages_order/components/list/gourmet/productSelectList.vue b/pages_order/components/list/gourmet/productSelectList.vue
index 783d450..30372e7 100644
--- a/pages_order/components/list/gourmet/productSelectList.vue
+++ b/pages_order/components/list/gourmet/productSelectList.vue
@@ -6,7 +6,7 @@
 				<view v-for="(item, index) in list" 
 				:key="index" 
 				@click="" class="item">
-					<view class="checkbox">
+					<view class="checkbox" v-if="detail.pay == 'Y'">
 						<uv-checkbox 
 						:name="item.id" 
 						activeColor="#FA5A0A" 
@@ -39,6 +39,7 @@
 						</view>
 						<view class="unit">
 							<uv-number-box 
+							v-if="detail.pay == 'Y'"
 							v-model="selectNumMap[item.id]" 
 							:max="item.num"
 							>
@@ -65,7 +66,7 @@
 			</uv-checkbox-group>
 		</view>
 		
-		<view class="action">
+		<view class="action" v-if="detail.pay == 'Y'">
 			<view class="icon">
 				<image src="/static/image/cart/2.png" mode=""></image>
 				<view class="num">{{ checkboxValue.length }}</view>
@@ -124,6 +125,9 @@
 			shopId : {
 				default : ''
 			},
+			detail : {
+				default : {}
+			}
 		},
 		computed : {
 			...mapState(['priceMap']),
diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue
index 4e54d1a..29099a1 100644
--- a/pages_order/gourmet/gourmetDetail.vue
+++ b/pages_order/gourmet/gourmetDetail.vue
@@ -58,6 +58,7 @@
 			<productSelectList 
 			:shopId="detail.id"
 			:edit="detail.shopUser == userInfo.id"
+			:detail="detail"
 			@getData="getData"
 			:list="list"/>
 		</view>
diff --git a/pages_order/gourmet/qrCode.vue b/pages_order/gourmet/qrCode.vue
index daed1a8..3c82ad2 100644
--- a/pages_order/gourmet/qrCode.vue
+++ b/pages_order/gourmet/qrCode.vue
@@ -15,10 +15,9 @@
 			<image 
 				class="qrcode-image" 
 				:src="qrCodeUrl" 
-				mode="aspectFit"
+				mode="widthFix"
 				@load="imageLoaded"
 				@error="imageError"
-				@longpress="saveImage"
 			></image>
 			<text class="qrcode-tip" v-if="!loading && qrCodeUrl">扫描二维码查看店铺详情</text>
 			<text class="save-tip" v-if="!loading && qrCodeUrl">长按图片可保存到相册</text>
@@ -206,15 +205,12 @@
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	margin-top: 100rpx;
-	background-color: #fff;
-	padding: 40rpx;
-	border-radius: 16rpx;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+	// background-color: #fff;
+	// border-radius: 16rpx;
+	// box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
 	
 	.qrcode-image {
-		width: 500rpx;
-		height: 500rpx;
+		width: 700rpx;
 		margin-bottom: 30rpx;
 	}