From 569884e804d54ca808a9857abce51346e64c06da Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 30 Sep 2026 15:07:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=BA=97=E9=93=BA=E6=8A=98=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                              |  8 ++++----
 src/pages/tabbar/coopMerchant.vue | 23 ++++++++++++++++++++++-
 src/pages/tabbar/my.vue           |  1 -
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 0ed20e9..c647c59 100644
--- a/.env
+++ b/.env
@@ -25,16 +25,16 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 # VITE_ZZD_CORP_ID=
 
 # --------------------------- 开发环境 api地址 ----------------------------------
-VITE_APP_DEV_SERVICE = https://www.pjzhhq.cn/api # 域名线上
+# VITE_APP_DEV_SERVICE = https://www.pjzhhq.cn/api # 域名线上
 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
-#  VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # 邓-本地
+ VITE_APP_DEV_SERVICE = https://dzc-test-1.fy.takin.cc # 邓-本地
 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # 邓-本地
 # VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上
 
 # --------------------------- 开发环境 图片访问基础地址 ---------------------------
-VITE_IMAGE_DEV_PATH = https://www.pjzhhq.cn/api # 域名线上
+# VITE_IMAGE_DEV_PATH = https://www.pjzhhq.cn/api # 域名线上
 #VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上
-# VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
+VITE_IMAGE_DEV_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
 # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999
 # VITE_IMAGE_DEV_PATH = http://123.157.250.162:8089/api # 测试线上
 
diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue
index 95af28f..f8a7a26 100644
--- a/src/pages/tabbar/coopMerchant.vue
+++ b/src/pages/tabbar/coopMerchant.vue
@@ -193,7 +193,12 @@ const toBranchDetail = async (b: any) => {
 									<tm-icon name="store-2-line" color="#9BBDF6" :size="28" />
 								</view>
 								<view class="flex-1 min-w-0 m-l-14rpx">
-									<text class="sub-text-26 show-line">{{ b.name }}</text>
+									<view class="flex items-center">
+										<text class="sub-text-26 show-line flex-1 min-w-0">{{ b.name }}</text>
+										<view v-if="b.discountsPrice" class="promo-pill m-l-8rpx flex-none">
+											{{ b.discountsPrice }}
+										</view>
+									</view>
 									<view v-if="b.addressDes || b.phone" class="m-t-2rpx">
 										<text class="second-text-22 show-line">{{ b.addressDes || b.phone }}</text>
 									</view>
@@ -236,6 +241,22 @@ const toBranchDetail = async (b: any) => {
 	line-height: 1.4;
 }
 
+/* 分店行内的优惠价格胶囊：几何对齐 brand-pill，配色对齐 promo-bar；
+   discountsPrice 是运营自由文案，限宽单行截断避免撑破紧凑行 */
+.promo-pill {
+	max-width: 320rpx;
+	padding: 4rpx 14rpx;
+	border-radius: 999rpx;
+	background: #fff1f0;
+	color: #f63a36;
+	font-size: 20rpx;
+	font-weight: 500;
+	line-height: 1.5;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 .branch-toggle {
 	display: flex;
 	align-items: center;
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 92bcd8d..49e1077 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -2,7 +2,6 @@
 	<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
 		<template #main-top>
 			<view class="flex items-center py-3 px-5">
-				asdfasdf
 				<view class="flex items-center" v-if="state.userInfo?.sysUser?.userId" @tap="doUserArea">
 					<image v-if="state.userInfo?.sysUser?.avatar" class="size-100rpx rounded-full"
 						:src="filePath(state.userInfo.sysUser.avatar)" mode="aspectFill" />