zianxin/pj_h5_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:店铺折扣

Browse Source
This commit is contained in:
dzc committed 2026-09-30 15:07:51 +08:00
1 parent db77d2eeed
commit 569884e804
3 files changed
+26 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env
+4 -4
View File
@@ -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 # 测试线上
src/pages/tabbar/coopMerchant.vue
+22 -1
View File
@@ -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;
src/pages/tabbar/my.vue
-1
View File
@@ -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" />