diff --git a/.env b/.env index 74db4a7..39d2975 100644 --- a/.env +++ b/.env @@ -18,6 +18,8 @@ SHOPRO_VERSION=v2.4.1 #SHOPRO_DEV_BASE_URL=http://www.qflyqzy.net:48090 #SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api +# 伟伟 +# SHOPRO_DEV_BASE_URL=http://192.168.1.4:48080 # 测试环境 SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com diff --git a/components/card_tabber/card_tabber.vue b/components/card_tabber/card_tabber.vue index 5079524..6d432b1 100644 --- a/components/card_tabber/card_tabber.vue +++ b/components/card_tabber/card_tabber.vue @@ -83,13 +83,13 @@ pagePath: '/pages/index/index', text: '首页', iconPath: '/static/index/1.png', - selectedIconPath: '/static/index/1_1.png', + selectedIconPath: '/static/index/blue_icon/1_1.png', }, { pagePath: '/pages/index/aiStore', text: 'AI店铺', iconPath: '/static/index/2.png', - selectedIconPath: '/static/index/2_1.png', + selectedIconPath: '/static/index/blue_icon/2_1.png', }, { pagePath: '/pages/home/seed', @@ -102,13 +102,13 @@ pagePath: '/pages/cart/cart', text: '购物车', iconPath: '/static/index/3.png', - selectedIconPath: '/static/index/3_1.png', + selectedIconPath: '/static/index/blue_icon/3_1.png', }, { pagePath: '/pages/index/user', text: '我的', iconPath: '/static/index/4.png', - selectedIconPath: '/static/index/4_1.png', + selectedIconPath: '/static/index/blue_icon/4_1.png', }, ]); @@ -220,7 +220,7 @@ } .textActive { - color: var(--color32, #fa7e31); + color: #3b5efb; } .safe-bottom { diff --git a/pages/home/liquidation.vue b/pages/home/liquidation.vue index f9c6a3c..72f80b2 100644 --- a/pages/home/liquidation.vue +++ b/pages/home/liquidation.vue @@ -7,7 +7,7 @@ - 当前钱包余额 + 当前可提现金额 {{ $fen2yuan(walletBalanceCents || 0) }} @@ -107,7 +107,7 @@ const refreshWallet = async () => { const res = await payApi.getWallet().catch(() => ({ code: -1 })); - if (res?.code === 0) walletBalanceCents.value = res?.data?.balance ?? 0; + if (res?.code === 0) walletBalanceCents.value = res?.data?.withdrawAmount ?? 0; }; const onAmountBlur = () => { diff --git a/pages/index/aiStore.vue b/pages/index/aiStore.vue index edfe57d..b524f91 100644 --- a/pages/index/aiStore.vue +++ b/pages/index/aiStore.vue @@ -1,163 +1,359 @@ diff --git a/pages/index/components/aistore_tab1.vue b/pages/index/components/aistore_tab1.vue new file mode 100644 index 0000000..a28eed5 --- /dev/null +++ b/pages/index/components/aistore_tab1.vue @@ -0,0 +1,20 @@ + + + diff --git a/pages/index/components/aistore_tab2.vue b/pages/index/components/aistore_tab2.vue index 8110a4b..634ae57 100644 --- a/pages/index/components/aistore_tab2.vue +++ b/pages/index/components/aistore_tab2.vue @@ -1,151 +1,33 @@ diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue index 8d84a3d..08a890f 100644 --- a/sheep/components/s-layout/s-layout.vue +++ b/sheep/components/s-layout/s-layout.vue @@ -222,6 +222,14 @@ scrollColor: '#ffffff', }; } + if (props.navPreset === 'blue') { + return { + bg: '#2556EC', + color: '#ffffff', + scrollbg: '#000000', + scrollColor: '#ffffff', + }; + } return { bg: undefined, color: undefined, diff --git a/static/index/blue_icon/1_1.png b/static/index/blue_icon/1_1.png new file mode 100644 index 0000000..4a85e01 Binary files /dev/null and b/static/index/blue_icon/1_1.png differ diff --git a/static/index/blue_icon/2_1.png b/static/index/blue_icon/2_1.png new file mode 100644 index 0000000..1a0f178 Binary files /dev/null and b/static/index/blue_icon/2_1.png differ diff --git a/static/index/blue_icon/3_1.png b/static/index/blue_icon/3_1.png new file mode 100644 index 0000000..e1b4405 Binary files /dev/null and b/static/index/blue_icon/3_1.png differ diff --git a/static/index/blue_icon/4-1.png b/static/index/blue_icon/4-1.png new file mode 100644 index 0000000..c4c0ef9 Binary files /dev/null and b/static/index/blue_icon/4-1.png differ