diff --git a/README.md b/README.md index a4430d4..445cb52 100644 --- a/README.md +++ b/README.md @@ -1,9 +1 @@ -

- - - -

- -

- x-4 -

+x-6 docs diff --git a/env/.env b/env/.env index 6304ef7..c959206 100644 --- a/env/.env +++ b/env/.env @@ -7,9 +7,6 @@ VITE_WX_APPID = 'wxa2abb91f64032a2b' # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base VITE_APP_PUBLIC_BASE=/ -VITE_SERVER_BASEURL = 'https://api.qmbz.cc' -VITE_UPLOAD_BASEURL = 'https://api.qmbz.cc/api/common/upload' - # h5是否需要配置代理 VITE_APP_PROXY=false VITE_APP_PROXY_PREFIX = '/api' diff --git a/env/.env.development b/env/.env.development index 04fa273..21199c6 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,3 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true + +VITE_SERVER_BASEURL = 'https://hugo-x6.yhdmit.com' +VITE_UPLOAD_BASEURL = 'https://hugo-x6.yhdmit.com/api/common/upload' diff --git a/env/.env.production b/env/.env.production index 8a1b50c..2c82505 100644 --- a/env/.env.production +++ b/env/.env.production @@ -4,3 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = true # 是否开启sourcemap VITE_SHOW_SOURCEMAP = false + +VITE_SERVER_BASEURL = 'https://api.qmbz.cc' +VITE_UPLOAD_BASEURL = 'https://api.qmbz.cc/api/common/upload' diff --git a/pages.config.ts b/pages.config.ts index 4755d34..0841c64 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -18,7 +18,7 @@ export default defineUniPages({ }, tabBar: { color: '#999999', - selectedColor: '#0E57A2', + selectedColor: '#BE805A', backgroundColor: '#ffffff', borderStyle: '#E7E7E7', height: '56px', @@ -32,17 +32,17 @@ export default defineUniPages({ pagePath: 'pages/index/index', text: '首页', }, - { - iconPath: 'static/tabbar/invest.png', - selectedIconPath: 'static/tabbar/investHL.png', - pagePath: 'pages/invest/index', - text: '保障', - }, { iconPath: 'static/tabbar/house.png', selectedIconPath: 'static/tabbar/houseHL.png', pagePath: 'pages/invite/index', - text: '社区', + text: '邀请好友', + }, + { + iconPath: 'static/tabbar/invest.png', + selectedIconPath: 'static/tabbar/investHL.png', + pagePath: 'pages/invest/index', + text: '房产集团', }, { iconPath: 'static/tabbar/personal.png', diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue index d4987b7..8d94a0d 100644 --- a/src/components/Avatar.vue +++ b/src/components/Avatar.vue @@ -10,12 +10,7 @@ defineProps({ + + diff --git a/src/hooks/useCaptcha.ts b/src/hooks/useCaptcha.ts index 12b8375..dcb95b1 100644 --- a/src/hooks/useCaptcha.ts +++ b/src/hooks/useCaptcha.ts @@ -1,15 +1,16 @@ -const baseUrl = import.meta.env.VITE_SERVER_BASEURL -export const useCaptcha = () => { - const t = ref(Date.now()) +import { getCaptchaAPI } from '@/service' - const codeUrl = computed(() => { - return baseUrl + '/api/index/captcha?t=' + t.value - }) - const refreshCode = () => { - t.value = Date.now() +export const useCaptcha = () => { + const codeUrl = ref('') + const codeKey = ref('') + + const refreshCode = async () => { + const res = await getCaptchaAPI() + codeUrl.value = res.data.img + codeKey.value = res.data.key } onMounted(() => { refreshCode() }) - return { codeUrl, t, refreshCode } + return { codeUrl, codeKey, refreshCode } } diff --git a/src/interceptors/request.ts b/src/interceptors/request.ts index e5f1be5..46ef70f 100644 --- a/src/interceptors/request.ts +++ b/src/interceptors/request.ts @@ -52,7 +52,7 @@ const httpInterceptor = { // 3. 添加 token 请求头标识 const userStore = useUserStore() if (userStore.token) { - options.header.token = userStore.token + options.header.Authorization = `Bearer ${userStore.token}` } }, } diff --git a/src/pages-sub/asset-detail/index.vue b/src/pages-sub/asset-detail/index.vue index dc88dfb..0c4347d 100644 --- a/src/pages-sub/asset-detail/index.vue +++ b/src/pages-sub/asset-detail/index.vue @@ -1,9 +1,8 @@ { style: { - navigationBarTitleText: '资金明细', + navigationBarTitleText: '股权流量提现明细', navigationBarBackgroundColor: '#fff', - navigationStyle: 'custom', }, } @@ -18,7 +17,6 @@ const { list: assetList } = useListPageRequest(getMyAssetAPI) diff --git a/src/pages.json b/src/pages.json index 15a5497..cf1e19f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -15,7 +15,7 @@ }, "tabBar": { "color": "#999999", - "selectedColor": "#0E57A2", + "selectedColor": "#BE805A", "backgroundColor": "#ffffff", "borderStyle": "#E7E7E7", "height": "56px", @@ -29,17 +29,17 @@ "pagePath": "pages/index/index", "text": "首页" }, - { - "iconPath": "static/tabbar/invest.png", - "selectedIconPath": "static/tabbar/investHL.png", - "pagePath": "pages/invest/index", - "text": "保障" - }, { "iconPath": "static/tabbar/house.png", "selectedIconPath": "static/tabbar/houseHL.png", "pagePath": "pages/invite/index", - "text": "社区" + "text": "邀请好友" + }, + { + "iconPath": "static/tabbar/invest.png", + "selectedIconPath": "static/tabbar/investHL.png", + "pagePath": "pages/invest/index", + "text": "房产集团" }, { "iconPath": "static/tabbar/personal.png", @@ -55,7 +55,7 @@ "type": "home", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "首页" + "navigationBarTitleText": "云房产" } }, { @@ -72,14 +72,14 @@ "type": "page", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "保障" + "navigationBarTitleText": "房产集团" } }, { "path": "pages/invite/index", "type": "page", "style": { - "navigationBarTitleText": "社区", + "navigationBarTitleText": "邀请福利", "navigationBarBackgroundColor": "#fff", "navigationStyle": "custom" } @@ -128,9 +128,8 @@ "path": "asset-detail/index", "type": "page", "style": { - "navigationBarTitleText": "资金明细", - "navigationBarBackgroundColor": "#fff", - "navigationStyle": "custom" + "navigationBarTitleText": "股权流量提现明细", + "navigationBarBackgroundColor": "#fff" } }, { @@ -148,6 +147,14 @@ "navigationBarTitleText": "分包页面 标题" } }, + { + "path": "equity-withdrawal/index", + "type": "page", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "股权提现" + } + }, { "path": "hot-news/index", "type": "page", @@ -201,11 +208,18 @@ "path": "lottery/index", "type": "page", "style": { - "navigationBarTitleText": "转盘抽奖", + "navigationBarTitleText": "抽奖", "navigationBarBackgroundColor": "#fff", "navigationStyle": "custom" } }, + { + "path": "my-room-certificate/index", + "type": "page", + "style": { + "navigationBarTitleText": "我的房产" + } + }, { "path": "news/index", "type": "page", @@ -239,6 +253,27 @@ "navigationBarBackgroundColor": "#fff" } }, + { + "path": "room-certificate/index", + "type": "page", + "style": { + "navigationBarTitleText": "红本房产证" + } + }, + { + "path": "room-mail/index", + "type": "page", + "style": { + "navigationBarTitleText": "房本邮寄" + } + }, + { + "path": "room-transfer/index", + "type": "page", + "style": { + "navigationBarTitleText": "房产过户" + } + }, { "path": "team/index", "type": "page", @@ -253,7 +288,7 @@ "type": "page", "style": { "navigationStyle": "custom", - "navigationBarTitleText": "提现" + "navigationBarTitleText": "流量提现" } }, { diff --git a/src/pages/edit-password/index.vue b/src/pages/edit-password/index.vue index db0093f..1028bd1 100644 --- a/src/pages/edit-password/index.vue +++ b/src/pages/edit-password/index.vue @@ -116,7 +116,7 @@ onLoad(() => { .login-container { box-sizing: border-box; min-height: 100vh; - background-image: url('@/static/images/login-bg.png'); + background-image: url('@/static/images/login-bg.jpg'); background-repeat: no-repeat; background-size: cover; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 1b99df7..f9c9b9e 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -3,91 +3,49 @@ { style: { navigationStyle: 'custom', - navigationBarTitleText: '首页', + navigationBarTitleText: '云房产', }, }