diff --git a/src/components/fly-login/fly-login.vue b/src/components/fly-login/fly-login.vue index 10ea692..b2bf5a5 100644 --- a/src/components/fly-login/fly-login.vue +++ b/src/components/fly-login/fly-login.vue @@ -85,7 +85,7 @@ const onSubmit = async () => { height: 100%; display: flex; bottom: 0; - z-index: 999; + z-index: 999 !important; position: fixed; inset: 0; diff --git a/src/layouts/fg-tabbar/tabbarList.ts b/src/layouts/fg-tabbar/tabbarList.ts index 0001a77..e684f4e 100644 --- a/src/layouts/fg-tabbar/tabbarList.ts +++ b/src/layouts/fg-tabbar/tabbarList.ts @@ -50,8 +50,8 @@ export const tabbarList = [ ] const _tabbar = { - color: '#2d2d2d', - selectedColor: '#ff0000', + color: '#333333', + selectedColor: '#87d76b', backgroundColor: '#F8F8F8', borderStyle: 'black', height: '60px', diff --git a/src/pages.json b/src/pages.json index 55887bc..1e1574b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -15,8 +15,8 @@ } }, "tabBar": { - "color": "#2d2d2d", - "selectedColor": "#ff0000", + "color": "#333333", + "selectedColor": "#87d76b", "backgroundColor": "#F8F8F8", "borderStyle": "black", "height": "60px", diff --git a/src/pages/my/components/wx-login.vue b/src/pages/my/components/wx-login.vue index 2c28bfb..c680486 100644 --- a/src/pages/my/components/wx-login.vue +++ b/src/pages/my/components/wx-login.vue @@ -19,7 +19,7 @@ style="backdrop-filter: blur(2rpx); border-radius: 10rpx" > - + @@ -70,18 +70,25 @@ icon: '/static/icons/my3.png', color: 'blue', }, + // { + // name: '浏览记录', + // url: '/pages/users/browsingHistory/index', + // type: 2, + // icon: '/static/icons/my4.png', + // color: 'blue', + // }, { - name: '浏览记录', - url: '/pages/users/browsingHistory/index', + name: '平台客服', + url: '17309090670', type: 2, icon: '/static/icons/my4.png', color: 'blue', }, { - name: '平台客服', - url: '17309090670', - type: 2, + name: '上传商品', + url: '/pages/my/uploadProduct', + type: 1, icon: '/static/icons/my5.png', color: 'red', }, @@ -92,19 +99,19 @@ icon: '/static/icons/my7.png', color: 'red', }, - { - name: '上传商品', - url: '/pages/my/uploadProduct', - type: 1, - icon: '/static/icons/rural_ecommerce.png', - color: 'red', - }, + // { + // name: '上传商品', + // url: '/pages/my/uploadProduct', + // type: 1, + // icon: '/static/icons/rural_ecommerce.png', + // color: 'red', + // }, ]" > - + {{ item.name }} @@ -118,48 +125,64 @@ - diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue index 72d9300..1e5a08e 100644 --- a/src/pages/my/index.vue +++ b/src/pages/my/index.vue @@ -13,7 +13,7 @@ import { useUserStore } from '@/store' import { http } from '@/utils/http' import WxLogin from './components/wx-login.vue' -const userStore = useUserStore() +// const userStore = useUserStore() // const hasLogin = computed(() => userStore.userInfo?.nickname) // userStore.wxLogin() diff --git a/src/static/images/1-001.png b/src/static/images/1-001.png index 3c9ac39..cb83113 100644 Binary files a/src/static/images/1-001.png and b/src/static/images/1-001.png differ diff --git a/src/static/images/1-002.png b/src/static/images/1-002.png index f05682b..8099b54 100644 Binary files a/src/static/images/1-002.png and b/src/static/images/1-002.png differ diff --git a/src/static/images/2-001.png b/src/static/images/2-001.png index 4a4ce02..3eb28af 100644 Binary files a/src/static/images/2-001.png and b/src/static/images/2-001.png differ diff --git a/src/static/images/2-002.png b/src/static/images/2-002.png index 5069750..ed618ac 100644 Binary files a/src/static/images/2-002.png and b/src/static/images/2-002.png differ diff --git a/src/static/images/3-001.png b/src/static/images/3-001.png index 8637fed..ed941ff 100644 Binary files a/src/static/images/3-001.png and b/src/static/images/3-001.png differ diff --git a/src/static/images/3-002.png b/src/static/images/3-002.png index 5aa6e9c..3bab911 100644 Binary files a/src/static/images/3-002.png and b/src/static/images/3-002.png differ diff --git a/src/static/images/4-001.png b/src/static/images/4-001.png index 5fb279c..38691fe 100644 Binary files a/src/static/images/4-001.png and b/src/static/images/4-001.png differ diff --git a/src/static/images/4-002.png b/src/static/images/4-002.png index e79368c..0943ecc 100644 Binary files a/src/static/images/4-002.png and b/src/static/images/4-002.png differ diff --git a/src/static/images/5-001.png b/src/static/images/5-001.png deleted file mode 100644 index 12dbfe7..0000000 Binary files a/src/static/images/5-001.png and /dev/null differ diff --git a/src/static/images/5-002.png b/src/static/images/5-002.png deleted file mode 100644 index ffd4e51..0000000 Binary files a/src/static/images/5-002.png and /dev/null differ diff --git a/src/style/index.scss b/src/style/index.scss index ee3d03d..c56052a 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -48,11 +48,11 @@ page { } .color-black { - color: #333333ff !important; + color: #333333 !important; } .color-gary { - color: #999999ff !important; + color: #999999 !important; } .default-color {