From 1fe0a6351c91b01c1f34d0b0efe1d05188d712fc Mon Sep 17 00:00:00 2001
From: 15233722133 <15233722133@163.com>
Date: Tue, 2 Jun 2026 11:31:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0ai=E5=BA=97=E9=93=BA-?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=B0=E5=BD=95=E3=80=81=E9=87=91=E7=A7=8D?=
=?UTF-8?q?=E5=AD=90=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/ai_order/ai_order.vue | 2 +-
components/orderItem/orderItem.vue | 5 +-
pages.json | 11 ++
pages/AI/placeOrder.vue | 14 +-
pages/cart/cart.vue | 8 +-
pages/home/seed.vue | 49 +++--
pages/index/aiStore.vue | 101 +++++++---
pages/index/components/aistore_tab2.vue | 21 ++-
pages/index/listRecord.vue | 234 ++++++++++++++++++++++++
pages/order/confirm.vue | 14 +-
sheep/api/home/pay.js | 8 +
11 files changed, 406 insertions(+), 61 deletions(-)
create mode 100644 pages/index/listRecord.vue
diff --git a/components/ai_order/ai_order.vue b/components/ai_order/ai_order.vue
index 98eaa16..bb243c5 100644
--- a/components/ai_order/ai_order.vue
+++ b/components/ai_order/ai_order.vue
@@ -313,7 +313,7 @@
.card {
background: #fff;//#ffefe5;
border-radius: 12rpx;
- // padding: 24rpx 20rpx;
+ padding: 24rpx 20rpx;
box-sizing: border-box;
}
diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue
index ecc57ef..bf06386 100644
--- a/components/orderItem/orderItem.vue
+++ b/components/orderItem/orderItem.vue
@@ -48,6 +48,9 @@
+
+ 已优惠¥{{ fen2yuan(props.data.randomDiscountPrice) }}
+
{{ `共${props.data.productCount}件商品 合计: `
}}
@@ -208,4 +211,4 @@
.btnItem1 {
background: #F2F2F2;
}
-
\ No newline at end of file
+
diff --git a/pages.json b/pages.json
index 802ecac..5a75ab3 100644
--- a/pages.json
+++ b/pages.json
@@ -43,6 +43,17 @@
"group": "商城"
}
},
+ {
+ "path": "pages/index/listRecord",
+ "style": {
+ "navigationBarTitleText": "列表记录"
+ },
+ "meta": {
+ "sync": true,
+ "title": "列表记录",
+ "group": "商城"
+ }
+ },
{
"path": "pages/index/user",
"style": {
diff --git a/pages/AI/placeOrder.vue b/pages/AI/placeOrder.vue
index d567e31..c58d367 100644
--- a/pages/AI/placeOrder.vue
+++ b/pages/AI/placeOrder.vue
@@ -71,9 +71,9 @@
}).then((res) => {
settlementInfo.value = res.data || {};
- if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
- proxy.utils.toast('订单金额不能超过5000元');
- }
+ // if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
+ // proxy.utils.toast('订单金额不能超过5000元');
+ // }
if (settlementInfo.value?.items?.length) {
settlementInfo.value.items.forEach((e) => {
e.skuArr = e.items;
@@ -88,10 +88,10 @@
});
};
const sub = async () => {
- if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
- proxy.utils.toast('订单金额不能超过5000元, 请重新选择商品');
- return;
- }
+ // if (proxy.$fen2yuan(settlementInfo?.price?.payPrice || 0) >= 5000) {
+ // proxy.utils.toast('订单金额不能超过5000元, 请重新选择商品');
+ // return;
+ // }
if (!addressId.value) return proxy.utils.toast('请选择地址');
let res: any = await SpuApi.createOrder({ id: addressId.value });
if (res.code === 0) {
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 0040bed..dcb174c 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -187,10 +187,10 @@
sheep.$helper.toast('请先选择商品');
return;
}
- if (fen2yuan(state.totalPriceSelected) >= 5000) {
- sheep.$helper.toast('订单金额不能超过5000元, 请重新选择商品');
- return;
- }
+ // if (fen2yuan(state.totalPriceSelected) >= 5000) {
+ // sheep.$helper.toast('订单金额不能超过5000元, 请重新选择商品');
+ // return;
+ // }
await validateDeliveryType(state.selectedList.map((item) => item.spu).map((spu) => spu.id));
sheep.$router.go('/pages/order/confirm', {
data: JSON.stringify({
diff --git a/pages/home/seed.vue b/pages/home/seed.vue
index c90601b..5aff9e4 100644
--- a/pages/home/seed.vue
+++ b/pages/home/seed.vue
@@ -183,7 +183,7 @@
-
+
-
+
@@ -105,8 +120,7 @@
-
-
+
{
const res = await api.getShopCartList({});
if (res.code === 0) {
- payShow.value = Boolean(res.data.length || addShow.value);
+ payShow.value = index.value === 0 && Boolean(res.data.length || addShow.value);
}
};
@@ -315,7 +328,7 @@
const paymentRef = ref(null);
const addCar = (data) => {
- payShow.value = true;
+ payShow.value = index.value === 0;
addShow.value = true;
setTimeout(() => {
paymentRef.value?.addCar(data);
@@ -326,7 +339,11 @@
index.value = i;
dataList.value = [];
pageCommodity.value?.downCallback();
- payShow.value = !index.value;
+ if (index.value === 0) {
+ getCartList();
+ } else {
+ payShow.value = false;
+ }
};
const updatePrice = (val) => {
@@ -426,7 +443,7 @@
.notice-item {
height: 50rpx;
- padding: 0 24rpx;
+ padding: 0 20rpx;
border-radius: 999rpx;
background: rgba(255, 255, 255, 0.95);
}
@@ -443,7 +460,45 @@
flex: 1;
font-size: 22rpx;
color: #111111;
- line-height: 60rpx;
+ line-height: 50rpx;
+ }
+
+ .notice-marquee-viewport {
+ overflow: hidden;
+ height: 50rpx;
+ display: flex;
+ align-items: center;
+ border-radius: 30rpx;
+ }
+
+ .notice-marquee-track {
+ display: inline-flex;
+ align-items: center;
+ transform: translateX(0);
+ will-change: transform;
+ &.is-scroll {
+ animation: notice-marquee-move 16s linear infinite;
+ }
+ }
+
+ .notice-marquee-content {
+ display: inline-flex;
+ align-items: center;
+ flex-shrink: 0;
+ }
+
+ .notice-marquee-item {
+ flex-shrink: 0;
+ margin-right: 20rpx;
+ }
+
+ @keyframes notice-marquee-move {
+ 0% {
+ transform: translateX(0);
+ }
+ 100% {
+ transform: translateX(-50%);
+ }
}
.time-scroll {
diff --git a/pages/index/components/aistore_tab2.vue b/pages/index/components/aistore_tab2.vue
index 795aae4..d8173c7 100644
--- a/pages/index/components/aistore_tab2.vue
+++ b/pages/index/components/aistore_tab2.vue
@@ -1,6 +1,11 @@
-
-
+
+
{{ v.name }}
@@ -93,6 +98,18 @@
if (!Number.isFinite(num)) return '0.00';
return num.toFixed(2);
};
+
+ const toListRecord = (item) => {
+ const shopId = item?.id ?? '';
+ const name = item?.name ?? '';
+ const cover = item?.cover ?? '';
+ const url =
+ '/pages/index/listRecord' +
+ `?shopId=${encodeURIComponent(String(shopId))}` +
+ `&name=${encodeURIComponent(String(name))}` +
+ `&cover=${encodeURIComponent(String(cover))}`;
+ uni.navigateTo({ url });
+ };
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index af349c0..40b25ab 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -188,10 +188,10 @@
// 提交订单
function onConfirm() {
- if (fen2yuan(state.orderInfo.price.payPrice) >= 5000) {
- sheep.$helper.toast('订单金额不能超过5000元, 请重新选择商品');
- return;
- }
+ // if (fen2yuan(state.orderInfo.price.payPrice) >= 5000) {
+ // sheep.$helper.toast('订单金额不能超过5000元, 请重新选择商品');
+ // return;
+ // }
if (addressState.value.deliveryType === 1 && !addressState.value.addressInfo.id) {
sheep.$helper.toast('请选择收货地址');
return;
@@ -282,9 +282,9 @@
if (state.orderInfo.address) {
addressState.value.addressInfo = state.orderInfo.address;
}
- if (fen2yuan(state.orderInfo.price.payPrice) >= 5000) {
- sheep.$helper.toast('订单金额不能超过5000元');
- }
+ // if (fen2yuan(state.orderInfo.price.payPrice) >= 5000) {
+ // sheep.$helper.toast('订单金额不能超过5000元');
+ // }
return code;
}
diff --git a/sheep/api/home/pay.js b/sheep/api/home/pay.js
index ce22bd0..4954867 100644
--- a/sheep/api/home/pay.js
+++ b/sheep/api/home/pay.js
@@ -93,6 +93,14 @@ export const getBankList = (params) => {
params,
});
};
+// 添加银行卡 /member/user/bank/update
+export const addBank = (data) => {
+ return request({
+ url: '/member/user/bank/create',
+ method: 'POST',
+ data,
+ })
+}
//获取待释放列表
export const getReleaseList = (params) => {
return request({