From 2449d67e53197bf6861fac22d401a4101ab729df Mon Sep 17 00:00:00 2001
From: 15233722133 <15233722133@163.com>
Date: Fri, 5 Jun 2026 17:20:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA=E6=97=B6=E5=BA=95=E9=83=A8=E4=B8=8D=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E2=80=9C=E5=8E=BB=E7=BB=93=E7=AE=97=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 5 +-
components/card_payment/card_payment.vue | 26 ++---
pages/home/agency.vue | 2 +-
pages/index/aiStore.vue | 24 ++---
pages/index/user.vue | 2 +-
pages/order/list.vue | 117 +++++++++++++++--------
static/icon/search.svg | 1 +
7 files changed, 104 insertions(+), 73 deletions(-)
create mode 100644 static/icon/search.svg
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5d5203..0b2661d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,9 @@
- 添加商城订单列type为5(开通ai店铺订单)详情接口api
- 首页`会员优选`分类兜底(已开通ai店铺不展示)
- 首页`会员优选`分类点击购买直接跳转到购买页、支付完成返回首页
-- 我的社员ui重构
+- 我的社员、我的订单ui重构
- 粉色卡默认false所有页面统一调整
- 选品广场结算返回到我的店铺页
- 点底部 tab 的`AI店铺`时没开通就不跳转并提示
-- `会员优选`商品卡片点击不再跳转到商品详情页
\ No newline at end of file
+- `会员优选`商品卡片点击不再跳转到商品详情页
+- 购物车为空时:底部不显示“去结算”
\ No newline at end of file
diff --git a/components/card_payment/card_payment.vue b/components/card_payment/card_payment.vue
index 506f2af..7195175 100644
--- a/components/card_payment/card_payment.vue
+++ b/components/card_payment/card_payment.vue
@@ -1,6 +1,10 @@
-
+
@@ -120,14 +124,9 @@
const cartList = ref([]);
let price = ref(0);
let num = ref(0);
- let addShow1 = ref(false)
- watch(() => props.addShow, () => {
- addShow1.value = props.addShow
- }, {
- immediate: true,
- deep: true
- })
- const getCartList = (val : any = true) => {
+ const barVisible = computed(() => Array.isArray(cartList.value) && cartList.value.length > 0);
+
+ const getCartList = () => {
num.value = 0;
price.value = 0;
SpuApi.getShopCartList({}).then((res) => {
@@ -146,14 +145,9 @@
});
price.value += e.discountedPrice;
});
- addShow1.value = true
- } else {
- if (!val) {
- addShow1.value = false
- }
}
cartList.value = list;
- proxy.$emit('updatePrice', addShow1.value);
+ proxy.$emit('updatePrice', list.length > 0);
});
};
@@ -252,7 +246,7 @@
// 删除接口
SpuApi.deleteShopCart({ id: v.id }).then((res) => {
if (res.code === 0) {
- getCartList(false);
+ getCartList();
proxy.$emit('updataList');
}
});
diff --git a/pages/home/agency.vue b/pages/home/agency.vue
index 7d79366..ecc17b9 100644
--- a/pages/home/agency.vue
+++ b/pages/home/agency.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/index/aiStore.vue b/pages/index/aiStore.vue
index 5a139a6..b0b34f5 100644
--- a/pages/index/aiStore.vue
+++ b/pages/index/aiStore.vue
@@ -154,12 +154,12 @@
-
+
@@ -216,7 +216,7 @@
const getCartList = async () => {
const res = await api.getShopCartList({});
if (res.code === 0) {
- payShow.value = index.value === 0 && Boolean(res.data.length || addShow.value);
+ hasPaymentBar.value = index.value === 0 && Boolean(res.data.length);
}
};
@@ -255,13 +255,12 @@
const index = ref(0);
const height = ref(`${baseHeight}px`);
- const payShow = ref(false);
- const addShow = ref(false);
+ const hasPaymentBar = ref(false);
watch(
- () => payShow.value,
+ () => hasPaymentBar.value,
() => {
- const extra = payShow.value ? paymentBarReserve : 0;
+ const extra = hasPaymentBar.value ? paymentBarReserve : 0;
height.value = `${baseHeight - extra}px`;
},
{ immediate: true },
@@ -342,11 +341,7 @@
const paymentRef = ref(null);
const addCar = (data) => {
- payShow.value = index.value === 0;
- addShow.value = true;
- setTimeout(() => {
- paymentRef.value?.addCar(data);
- }, 500);
+ paymentRef.value?.addCar(data);
};
const navChange = (i) => {
@@ -356,13 +351,12 @@
if (index.value === 0) {
getCartList();
} else {
- payShow.value = false;
+ hasPaymentBar.value = false;
}
};
const updatePrice = (val) => {
- addShow.value = val;
- getCartList();
+ hasPaymentBar.value = Boolean(val);
};
function shipment() {
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 231e86f..7dce475 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -326,7 +326,7 @@
left: 0;
width: 100%;
height: v-bind('headerBgHeight');
- background: #00f;
+ background: url('@/static/index/login_bg.png') no-repeat 100%;
border-radius: 0 0 30rpx 30rpx;
image {
diff --git a/pages/order/list.vue b/pages/order/list.vue
index b0b7145..bd21872 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,6 +1,6 @@
-
+
{{ v.name }}
@@ -43,17 +45,23 @@
-
-
-
- 搜索
+
+
+
+
+
+
+
+
+
+
+
@@ -168,8 +176,13 @@
return;
}
const pageData = dataList.value?.[mescroll.dataObj.i] || {};
- const list = Array.isArray(pageData?.list) ? pageData.list : Array.isArray(pageData) ? pageData : [];
- const nextList = state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list;
+ const list = Array.isArray(pageData?.list)
+ ? pageData.list
+ : Array.isArray(pageData)
+ ? pageData
+ : [];
+ const nextList =
+ state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list;
nextList.forEach((order) => handleOrderButtons(order));
if (mescroll.num == 1) state.list[mescroll.dataObj.i] = [];
state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList);
@@ -228,24 +241,29 @@
.navItem {
padding: 18rpx 0;
+ color: rgba(255, 255, 255, 0.85);
}
.activeItem {
- color: #ff3c48;
- border-bottom: 6rpx solid #ff3c48;
+ color: #ffffff;
+ border-bottom: 6rpx solid rgba(255, 255, 255, 0.95);
}
.nav {
height: 320rpx;
- background-color: #fff;
+ background-color: #2556ec;
+ background-image: url('/static/index/logIn_bg.png');
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ background-position: top center;
+ border-radius: 0 0 30rpx 30rpx;
}
.order-list-nav-top {
height: 100rpx;
display: flex;
align-items: center;
- border-bottom: 1rpx solid #ffe1d9;
- background-color: #fff5f2;
+ background-color: transparent;
}
.type-tabs {
@@ -265,17 +283,14 @@
.type-tab-text {
position: relative;
- padding: 18rpx 0;
- font-weight: 500;
- color: #333;
+ padding: 0 25rpx;
+ color: rgba(255, 255, 255, 0.85);
+ border-radius: 10rpx;
}
.activeTypeItem {
- color: #ff3c48;
- }
-
- .activeTypeUnderline {
- border-bottom: 6rpx solid #ff3c48;
+ color: #ffffff;
+ background: linear-gradient(135deg, var(--countdown-grad-start), var(--countdown-grad-end));
}
.search {
@@ -285,19 +300,45 @@
margin-bottom: 16rpx;
}
- .searchBtn {
- margin-left: 16rpx;
- }
-
- :deep(.is-input-border) {
+ .searchInput {
+ background-color: #ffffff;
+ border-radius: 44rpx;
+ overflow: hidden;
height: 72rpx;
- border-radius: 36rpx;
- background-color: #f7f8fa;
- border: none;
}
- :deep(.is-input-border) {
- background: rgba(255, 255, 255, 0.34);
+ .searchField {
+ height: 72rpx;
+ padding-left: 28rpx;
+ box-sizing: border-box;
+ }
+
+ .searchFieldIcon {
+ width: 32rpx;
+ height: 32rpx;
+ margin-right: 16rpx;
+ flex: 0 0 auto;
+ }
+
+ .searchBtn {
+ width: 96rpx;
+ height: 62rpx;
+ padding: 0 10rpx;
+ margin: 5rpx;
+ border-radius: 44rpx;
+ background: linear-gradient(135deg, var(--primary-grad-start), var(--primary-grad-end));
+ border: 2rpx solid rgba(255, 255, 255, 0.95);
+ }
+
+ :deep(.uni-easyinput__content) {
+ background-color: transparent;
+ height: 72rpx;
+ }
+
+ .searchBtnIcon {
+ width: 32rpx;
+ height: 32rpx;
+ filter: brightness(0) invert(1);
}
.orderCon {
diff --git a/static/icon/search.svg b/static/icon/search.svg
new file mode 100644
index 0000000..469cf1f
--- /dev/null
+++ b/static/icon/search.svg
@@ -0,0 +1 @@
+
\ No newline at end of file