diff --git a/src/components/XNav.vue b/src/components/XNav.vue index 0dc0f36..f8bbefd 100644 --- a/src/components/XNav.vue +++ b/src/components/XNav.vue @@ -22,7 +22,10 @@ const title = ref(document.title); src="/static/icons/back.png"> - {{ title }} + + {{ title }} + + diff --git a/src/components/XNoticeBar.vue b/src/components/XNoticeBar.vue index e3d51d3..9776794 100644 --- a/src/components/XNoticeBar.vue +++ b/src/components/XNoticeBar.vue @@ -1,5 +1,5 @@ @@ -81,7 +91,6 @@ onMounted(() => { text-align: left; white-space: nowrap; display: inline-flex; - align-items: center; gap: 18rpx; } diff --git a/src/main.js b/src/main.js index 0fa74df..b8fdd98 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,9 @@ -import { - createSSRApp -} from "vue"; +import {createSSRApp} from "vue"; import App from "./App.vue"; import './scss/index.css'; import './scss/index.scss'; import './scss/global.scss'; +import './scss/font.scss'; import './scss/uni.scss'; import propsConfig from "./scss/thorui.config.js"; import {createPinia} from "pinia"; @@ -13,11 +12,11 @@ import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'; uni.$tui = propsConfig; export function createApp() { - const app = createSSRApp(App); + const app = createSSRApp(App); const pinia = createPinia(); pinia.use(piniaPluginPersistedstate); app.use(pinia); - return { - app, - }; + return { + app, + }; } diff --git a/src/pages.json b/src/pages.json index 569f927..4d6d31e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -92,6 +92,34 @@ "navigationBarTitleText": "编辑资料", "navigationStyle": "custom" } + }, + { + "path": "pages/wallet/index", + "style": { + "navigationBarTitleText": "我的钱包", + "navigationStyle": "custom" + } + }, + { + "path": "pages/paymentAccount/index", + "style": { + "navigationBarTitleText": "收款账号", + "navigationStyle": "custom" + } + }, + { + "path": "pages/addPaymentAccount/index", + "style": { + "navigationBarTitleText": "添加收款账号", + "navigationStyle": "custom" + } + }, + { + "path": "pages/richPage/index", + "style": { + "navigationBarTitleText": "富文本页面", + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/src/pages/addPaymentAccount/components/AliPay.vue b/src/pages/addPaymentAccount/components/AliPay.vue new file mode 100644 index 0000000..3d4f137 --- /dev/null +++ b/src/pages/addPaymentAccount/components/AliPay.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/pages/addPaymentAccount/components/BankPay.vue b/src/pages/addPaymentAccount/components/BankPay.vue new file mode 100644 index 0000000..fe226ba --- /dev/null +++ b/src/pages/addPaymentAccount/components/BankPay.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/pages/addPaymentAccount/index.vue b/src/pages/addPaymentAccount/index.vue new file mode 100644 index 0000000..1329ffe --- /dev/null +++ b/src/pages/addPaymentAccount/index.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/pages/paymentAccount/index.vue b/src/pages/paymentAccount/index.vue new file mode 100644 index 0000000..fb2b8d3 --- /dev/null +++ b/src/pages/paymentAccount/index.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/pages/richPage/index.vue b/src/pages/richPage/index.vue new file mode 100644 index 0000000..992dce0 --- /dev/null +++ b/src/pages/richPage/index.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 5cc6bd7..ad229b9 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -95,7 +95,7 @@ const tabs = [ 变动记录 - + 我的钱包 diff --git a/src/pages/wallet/index.vue b/src/pages/wallet/index.vue index 0ad2bc1..bd54e16 100644 --- a/src/pages/wallet/index.vue +++ b/src/pages/wallet/index.vue @@ -1,11 +1,94 @@ - diff --git a/src/scss/font.scss b/src/scss/font.scss new file mode 100644 index 0000000..cd40cd7 --- /dev/null +++ b/src/scss/font.scss @@ -0,0 +1,3 @@ +.HarmonyOS { + font-family: HarmonyOS Sans; +} diff --git a/src/static/icons/icon-delete-white.png b/src/static/icons/icon-delete-white.png new file mode 100644 index 0000000..92739be Binary files /dev/null and b/src/static/icons/icon-delete-white.png differ diff --git a/src/static/icons/icon-edit-white.png b/src/static/icons/icon-edit-white.png new file mode 100644 index 0000000..bc50a19 Binary files /dev/null and b/src/static/icons/icon-edit-white.png differ diff --git a/src/static/icons/icon-radio-s.png b/src/static/icons/icon-radio-s.png new file mode 100644 index 0000000..cb9111c Binary files /dev/null and b/src/static/icons/icon-radio-s.png differ diff --git a/src/static/icons/icon-radio.png b/src/static/icons/icon-radio.png new file mode 100644 index 0000000..0fc2ef9 Binary files /dev/null and b/src/static/icons/icon-radio.png differ diff --git a/src/static/icons/payICON.png b/src/static/icons/payICON.png new file mode 100644 index 0000000..6d53a2f Binary files /dev/null and b/src/static/icons/payICON.png differ diff --git a/src/static/icons/right_blue.png b/src/static/icons/right_blue.png new file mode 100644 index 0000000..6d00d5f Binary files /dev/null and b/src/static/icons/right_blue.png differ diff --git a/src/utils/uils.js b/src/utils/uils.js index f6c97c1..437bc96 100644 --- a/src/utils/uils.js +++ b/src/utils/uils.js @@ -14,14 +14,20 @@ export const isWXWeb = () => { return userAgent.includes('MicroMessenger'); } -export const toPage = (url) => { - uni.reLaunch({ - url: url, - }).then(); +export const toPage = async (url) => { + try { + await uni.navigateTo({ + url: url, + }) + } catch (e) { + await uni.reLaunch({ + url: url, + }) + } } export const backPage = () => { - window.history.back(); + uni.navigateBack().then(); } export const copy = (context) => {