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 @@ - + @@ -425,7 +425,7 @@ itemHeight: 5, data: ['分红池', '底价存池'], }, - color: ['rgba(238, 10, 36, 0.55)', 'rgba(247, 119, 46, 0.55)'], + color: ['#FF4E00', '#4260FA'], xAxis: { type: 'category', boundaryGap: false, @@ -449,8 +449,15 @@ smooth: true, symbol: 'none', data: [], + itemStyle: { color: '#4260FA' }, lineStyle: { color: 'transparent', width: 2 }, - areaStyle: { color: 'rgba(247, 119, 46, 0.25)' }, + areaStyle: { + opacity: 1, + color: new echarts.graphic.LinearGradient(0, 0, 1, 1, [ + { offset: 0, color: '#2E8DFA' }, + { offset: 1, color: '#4260FA' }, + ]), + }, }, { name: '分红池', @@ -459,8 +466,15 @@ smooth: true, symbol: 'none', data: [], + itemStyle: { color: '#FF4E00' }, lineStyle: { color: 'transparent', width: 2 }, - areaStyle: { color: 'rgba(238, 10, 36, 0.18)' }, + areaStyle: { + opacity: 1, + color: new echarts.graphic.LinearGradient(0, 0, 1, 1, [ + { offset: 0, color: '#FD9D72' }, + { offset: 1, color: '#FF4E00' }, + ]), + }, }, ], touchMoveThreshold: 10, @@ -795,8 +809,8 @@ } .seed-card__title { - font-size: 30rpx; - font-weight: 700; + font-size: 25rpx; + font-weight: bold; color: #585654; line-height: 1.2; } @@ -929,38 +943,41 @@ } .valuation-formula { - margin-top: 18rpx; - padding: 18rpx 20rpx; - background: #fff6f5; - border-radius: 8rpx; + width: 70%; + margin: 18rpx auto; + padding: 8rpx 0rpx; + background: linear-gradient(to bottom right, #2c8cfa 0%, #3d5efb 100%); + border-radius: 12rpx; font-size: 30rpx; - color: #585654; + color: #ffffff; display: flex; align-items: baseline; + justify-content: center; flex-wrap: wrap; gap: 6rpx; } .valuation-formula__v { font-weight: 800; - color: #e54035; + color: #ffffff; } .valuation-formula__sub { font-size: 22rpx; - color: #bbbbbb; + color: rgba(255, 255, 255, 0.85); margin-right: 6rpx; } .valuation-formula__eq { font-weight: 700; - color: #585654; + color: rgba(255, 255, 255, 0.95); } .valuation-desc { margin-top: 14rpx; - font-size: 24rpx; - color: #bbbbbb; + padding-left: 40rpx; + font-size: 20rpx; + color: #5d5b5b; line-height: 1.5; } diff --git a/pages/index/aiStore.vue b/pages/index/aiStore.vue index c0427fc..58e390b 100644 --- a/pages/index/aiStore.vue +++ b/pages/index/aiStore.vue @@ -1,5 +1,11 @@