From b6f2a0fdc1117548f4cead47c1b966b2071e0944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com>
Date: Mon, 14 Apr 2025 17:26:40 +0800
Subject: [PATCH] update

---
 src/components/XNav.vue                       |   5 +-
 src/components/XNoticeBar.vue                 |  31 +++---
 src/main.js                                   |  13 ++-
 src/pages.json                                |  28 ++++++
 .../addPaymentAccount/components/AliPay.vue   |  61 ++++++++++++
 .../addPaymentAccount/components/BankPay.vue  |  61 ++++++++++++
 src/pages/addPaymentAccount/index.vue         |  60 ++++++++++++
 src/pages/paymentAccount/index.vue            |  64 +++++++++++++
 src/pages/richPage/index.vue                  |  19 ++++
 src/pages/user/index.vue                      |   2 +-
 src/pages/wallet/index.vue                    |  89 +++++++++++++++++-
 src/scss/font.scss                            |   3 +
 src/static/icons/icon-delete-white.png        | Bin 0 -> 375 bytes
 src/static/icons/icon-edit-white.png          | Bin 0 -> 551 bytes
 src/static/icons/icon-radio-s.png             | Bin 0 -> 890 bytes
 src/static/icons/icon-radio.png               | Bin 0 -> 692 bytes
 src/static/icons/payICON.png                  | Bin 0 -> 9027 bytes
 src/static/icons/right_blue.png               | Bin 0 -> 360 bytes
 src/utils/uils.js                             |  16 +++-
 19 files changed, 424 insertions(+), 28 deletions(-)
 create mode 100644 src/pages/addPaymentAccount/components/AliPay.vue
 create mode 100644 src/pages/addPaymentAccount/components/BankPay.vue
 create mode 100644 src/pages/addPaymentAccount/index.vue
 create mode 100644 src/pages/paymentAccount/index.vue
 create mode 100644 src/pages/richPage/index.vue
 create mode 100644 src/scss/font.scss
 create mode 100644 src/static/icons/icon-delete-white.png
 create mode 100644 src/static/icons/icon-edit-white.png
 create mode 100644 src/static/icons/icon-radio-s.png
 create mode 100644 src/static/icons/icon-radio.png
 create mode 100644 src/static/icons/payICON.png
 create mode 100644 src/static/icons/right_blue.png

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">
             </image>
 
-            <view class="title">{{ title }}</view>
+            <view class="title">
+                <text v-if="!$slots.default">{{ title }}</text>
+                <slot v-else></slot>
+            </view>
         </view>
 
         <view class="h-[100rpx] w-full"></view>
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 @@
 <script setup>
-import {ref, onMounted} from "vue";
+import {onMounted, ref} from "vue";
 import warn from '../static/icons/warn.png';
 import success from '../static/icons/info.png';
 
@@ -14,7 +14,7 @@ const STATUS = {
     },
 };
 
-const {text, status} = defineProps({
+const {text, status, tile} = defineProps({
     text: {
         type: String,
         default: '提示：请在规定时间内，按要求提交回填1。以免影响收益。哈哈哈哈哈哈哈哈哈哈'
@@ -22,6 +22,10 @@ const {text, status} = defineProps({
     status: {
         type: String,
         default: 'error'
+    },
+    tile: {
+        type: Boolean,
+        default: false,
     }
 });
 
@@ -30,22 +34,28 @@ const Context = ref();
 const roll = ref(false);
 
 onMounted(() => {
-    if (
-        Context.value.$el.clientWidth
-        >
-        XNoticeBox.value.$el.clientWidth
-    ) {
-        roll.value = true;
+    if (!tile) {
+        if (
+            Context.value.$el.clientWidth
+            >
+            XNoticeBox.value.$el.clientWidth
+        ) {
+            roll.value = true;
+        }
     }
 });
 </script>
 
 <template>
     <view ref="XNoticeBox" :class="['x-notice-box', STATUS[status].bg]">
-        <view ref="Context" :class="['context', roll ? 'roll' : '', STATUS[status].context]">
+        <view ref="Context" :class="['context', roll ? 'roll' : '', STATUS[status].context]"
+              :style="{alignItems: tile ? 'start' : 'center'}">
             <image v-if="status==='error'" class="!size-[26rpx] flex-shrink-0" :src="warn"></image>
             <image v-else class="!size-[26rpx] flex-shrink-0" :src="success"></image>
-            <text class="!whitespace-nowrap flex-shrink-0">{{ text }}</text>
+            <text v-if="!tile" class="!whitespace-nowrap flex-shrink-0">{{ text }}</text>
+            <text v-else>
+                {{ text }}
+            </text>
         </view>
     </view>
 </template>
@@ -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 @@
+<script setup>
+import {reactive} from 'vue';
+import XForm from "../../../components/XForm.vue";
+import XFormItem from "../../../components/XFormItem.vue";
+import XInput from "../../../components/XInput.vue";
+import {toPage} from "../../../utils/uils.js";
+
+const rules = {
+    name: {
+        reg: /.+/,
+        msg: '姓名不能为空',
+    }
+};
+const form = reactive({
+    name: null,
+});
+</script>
+
+<template>
+    <view>
+        <x-form :model="form" :rules="rules">
+            <x-form-item label="真实姓名">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入真实姓名"></x-input>
+            </x-form-item>
+            <x-form-item label="身份证号码">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入身份证号码"></x-input>
+            </x-form-item>
+            <x-form-item label="支付宝账号">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入支付宝账号"></x-input>
+            </x-form-item>
+            <x-form-item label="手机号">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入手机号"></x-input>
+            </x-form-item>
+            <x-form-item>
+                <view class="items-center test-24r xy">
+                    <radio></radio>
+                    本人承诺已阅读并同意
+                    <text class="text-[var(--primary-color)]" @click="toPage('/pages/richPage/index')">
+                        《灵活用工平台综合服务协议》
+                    </text>
+                    ，本人按照协议内容向贵司提供相应的服务。
+                </view>
+            </x-form-item>
+            <x-form-item>
+                <view
+                    class="bg-[var(--primary-color)] py-[26rpx] w-full text-[#fff] rounded-[12rpx] !flex justify-center items-center !mt-[40rpx]">
+                    提交
+                </view>
+            </x-form-item>
+        </x-form>
+    </view>
+</template>
+
+<style scoped lang="scss">
+.xy {
+    :deep(.uni-radio-input) {
+        width: 28rpx;
+        height: 28rpx;
+    }
+}
+</style>
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 @@
+<script setup>
+import {reactive} from "vue";
+import {toPage} from "../../../utils/uils.js";
+import XInput from "../../../components/XInput.vue";
+import XFormItem from "../../../components/XFormItem.vue";
+import XForm from "../../../components/XForm.vue";
+
+const rules = {
+    name: {
+        reg: /.+/,
+        msg: '姓名不能为空',
+    }
+};
+const form = reactive({
+    name: null,
+});
+</script>
+
+<template>
+    <view>
+        <x-form :model="form" :rules="rules">
+            <x-form-item label="真实姓名">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入真实姓名"></x-input>
+            </x-form-item>
+            <x-form-item label="身份证号码">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入身份证号码"></x-input>
+            </x-form-item>
+            <x-form-item label="银行卡号">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入银行卡号"></x-input>
+            </x-form-item>
+            <x-form-item label="手机号">
+                <x-input v-model:model-value="form.name" height="96rpx" placeholder="请输入手机号"></x-input>
+            </x-form-item>
+            <x-form-item>
+                <view class="items-center test-24r xy">
+                    <radio></radio>
+                    本人承诺已阅读并同意
+                    <text class="text-[var(--primary-color)]" @click="toPage('/pages/richPage/index')">
+                        《灵活用工平台综合服务协议》
+                    </text>
+                    ，本人按照协议内容向贵司提供相应的服务。
+                </view>
+            </x-form-item>
+            <x-form-item>
+                <view
+                    class="bg-[var(--primary-color)] py-[26rpx] w-full text-[#fff] rounded-[12rpx] !flex justify-center items-center !mt-[40rpx]">
+                    提交
+                </view>
+            </x-form-item>
+        </x-form>
+    </view>
+</template>
+
+<style scoped lang="scss">
+.xy {
+    :deep(.uni-radio-input) {
+        width: 28rpx;
+        height: 28rpx;
+    }
+}
+</style>
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 @@
+<script setup>
+import {defineAsyncComponent, ref} from "vue";
+import XNav from "../../components/XNav.vue";
+import XNoticeBar from "../../components/XNoticeBar.vue";
+
+const AliPay = defineAsyncComponent(() => import('./components/AliPay.vue'));
+const BankPay = defineAsyncComponent(() => import('./components/BankPay.vue'));
+
+const currentTab = ref(0);
+const tabs = [
+    {
+        name: '支付宝账号',
+        component: AliPay,
+    },
+    {
+        name: '银行卡账号',
+        component: BankPay,
+    },
+];
+
+const change = (e) => {
+    currentTab.value = e.index;
+}
+</script>
+
+<template>
+    <!-- 立即提现 -->
+    <x-nav></x-nav>
+
+    <x-notice-bar
+        status="success"
+        :tile="true"
+        text="平台承诺：所有信息仅用于打款，不会用作其他用途。为了您的资金安全，大额提现会通过第三方支付代发，请填写实名信息和银行卡进行验证。">
+    </x-notice-bar>
+
+    <view class="bg-[#fff]">
+        <tui-tabs
+            :tabs="tabs"
+            :currentTab="currentTab"
+            @change="change"
+            width="300">
+        </tui-tabs>
+
+        <Suspense>
+            <template #default>
+                <view class="px-[34rpx] !mt-[40rpx]">
+                    <component :is="tabs[currentTab].component"></component>
+                </view>
+            </template>
+
+            <template #fallback>
+                加载中...
+            </template>
+        </Suspense>
+    </view>
+</template>
+
+<style scoped lang="scss">
+
+</style>
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 @@
+<script setup>
+import XNav from "../../components/XNav.vue";
+import {toPage} from "../../utils/uils.js";
+import ICON1 from "../../static/icons/payICON.png";
+import ICON2 from "../../static/icons/right_blue.png";
+import ICON3 from "../../static/icons/icon-edit-white.png";
+import ICON4 from "../../static/icons/icon-delete-white.png";
+import ICON5 from "../../static/icons/icon-radio.png";
+import ICON6 from "../../static/icons/icon-radio-s.png";
+import XLink from "../../components/XLink.vue";
+</script>
+
+<template>
+    <x-nav></x-nav>
+
+    <view class="p-[20rpx] !flex flex-col gap-[20rpx]">
+        <view class="py-[20rpx] pl-[30rpx] pr-[24rpx] rounded-[12rpx] bg-[#fff] w-full !flex gap-[22rpx] items-center"
+              @click="toPage('/pages/addPaymentAccount/index')">
+            <image class="!size-[72rpx]" mode="aspectFill" :src="ICON1"></image>
+            <view class="text-[#86909C] test-28r">您还没有添加收款信息~</view>
+            <x-link class="test-28r !ml-auto">去添加</x-link>
+            <image class="!w-[12rpx]" mode="widthFix" :src="ICON2"></image>
+        </view>
+
+        <view class="bg-[#3878F6] p-[32rpx] rounded-[12rpx]" v-for="i in 10">
+            <view class="!flex items-center">
+                <view class="text-[#fff]">支付宝</view>
+                <image class="!size-[35rpx] !ml-auto" mode="aspectFill" :src="ICON3"></image>
+                <image class="!size-[30rpx] !ml-[20rpx]" mode="aspectFill" :src="ICON4"></image>
+            </view>
+            <view class="HarmonyOS account">
+                135 7777 9865
+            </view>
+            <view class="radio-info">
+                <image v-if="false" class="!size-[30rpx]" mode="aspectFill" :src="ICON5"></image>
+                <image v-else class="!size-[30rpx]" mode="aspectFill" :src="ICON6"></image>
+                设为默认打款信息
+            </view>
+        </view>
+    </view>
+</template>
+
+<style scoped lang="scss">
+.radio-info {
+    color: rgb(255, 255, 255);
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 140%;
+    letter-spacing: 0;
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+}
+
+.account {
+    color: rgb(255, 255, 255);
+    font-size: 24px;
+    font-weight: 500;
+    line-height: 140%;
+    letter-spacing: 0;
+    margin-top: 26rpx;
+    margin-bottom: 22rpx;
+}
+</style>
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 @@
+<script setup>
+import {ref} from 'vue';
+import XNav from "../../components/XNav.vue";
+
+const title = ref('灵活用工平台综合服务协议');
+const nodes = ref('<div>Hello World!</div>');
+</script>
+
+<template>
+    <x-nav>{{ title }}</x-nav>
+
+    <view class="bg-[#fff]">
+        <rich-text :nodes="nodes"></rich-text>
+    </view>
+</template>
+
+<style scoped lang="scss">
+
+</style>
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 = [
                 <image class="!size-[40rpx]" mode="aspectFill" :src="ICON2"></image>
                 <view class="test-24r">变动记录</view>
             </view>
-            <view class="!flex items-center gap-[12rpx]">
+            <view class="!flex items-center gap-[12rpx]" @click="toPage('/pages/wallet/index')">
                 <image class="!size-[40rpx]" mode="aspectFill" :src="ICON3"></image>
                 <view class="test-24r">我的钱包</view>
             </view>
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 @@
 <script setup>
-
+import ICON1 from "../../static/icons/payICON.png";
+import ICON2 from "../../static/icons/right_blue.png";
+import XNav from "../../components/XNav.vue";
+import XLink from "../../components/XLink.vue";
+import Right from "../../static/icons/right.png";
+import {toPage} from "../../utils/uils.js";
 </script>
 
 <template>
     <!--钱包-->
+    <x-nav></x-nav>
+
+    <view class="!flex flex-col gap-[20rpx] p-[20rpx]">
+        <view class="py-[20rpx] pl-[30rpx] pr-[24rpx] rounded-[12rpx] bg-[#fff] w-full !flex gap-[22rpx] items-center"
+              @click="toPage('/pages/paymentAccount/index')">
+            <image class="!size-[72rpx]" mode="aspectFill" :src="ICON1"></image>
+            <view class="text-[#86909C] test-28r">您还没有添加收款信息~</view>
+            <x-link class="test-28r !ml-auto">去添加</x-link>
+            <image class="!w-[12rpx]" mode="widthFix" :src="ICON2"></image>
+        </view>
+
+        <view class="py-[32rpx] px-[24rpx] rounded-[12rpx] bg-[#fff] w-full">
+            <view class="!flex items-center justify-between">
+                <view>
+                    <view class="test-28r">可提现余额(元）</view>
+                    <view class="HarmonyOS" style="font-size: 60rpx;font-weight: 500;">0.00</view>
+                </view>
+                <view
+                    class="py-[8rpx] bg-[var(--primary-color)] text-[#fff] rounded-full w-[200rpx] !flex justify-center items-center">
+                    立即提现
+                </view>
+            </view>
+
+            <view class="h-[3rpx] bg-[#E5E6EB] !my-[20rpx]"></view>
+
+            <view class="wxts">
+                温馨提示<br/>
+                1.提现门槛为1元<br/>
+                2.打款时间:工作日11:00-18:00;<br/>
+                3.工作日18:00前提现的当日到款<br/>
+                4.工作日18:00后提现的次日到账;<br/>
+                5.如遇打款失败，可在提现记录中查看原因
+            </view>
+        </view>
+
+        <view class="w-full !grid grid-cols-3 gap-[20rpx]">
+            <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
+                <view class="text-[#4E5969] test-22r">总收益</view>
+                <view class="test-36r" style="font-weight: 700;">0.00</view>
+            </view>
+            <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
+                <view class="text-[#4E5969] test-22r">打款中</view>
+                <view class="test-36r" style="font-weight: 700;">0.00</view>
+            </view>
+            <view class="py-[24rpx] px-[20rpx] bg-[#fff] rounded-[16rpx]">
+                <view class="text-[#4E5969] test-22r">已提现</view>
+                <view class="test-36r" style="font-weight: 700;">0.00</view>
+            </view>
+        </view>
+
+        <view class="w-full bg-[#fff] rounded-[16rpx] overflow-hidden">
+            <view class="!flex items-center h-[108rpx] px-[32rpx]">
+                <view class="title">变动记录</view>
+                <view class="!ml-auto whitespace-nowrap value"></view>
+                <image class="!w-[16rpx] !ml-[16rpx]" mode="widthFix" :src="Right"></image>
+            </view>
+            <view class="h-[2rpx] w-full bg-[rgb(229,230,235)] !ml-[32rpx]"></view>
+
+            <view class="!flex items-center h-[108rpx] px-[32rpx]">
+                <view class="title">提现记录</view>
+                <view class="!ml-auto whitespace-nowrap value"></view>
+                <image class="!w-[16rpx] !ml-[16rpx]" mode="widthFix" :src="Right"></image>
+            </view>
+            <view class="h-[2rpx] w-full bg-[rgb(229,230,235)] !ml-[32rpx]"></view>
+
+            <view class="!flex items-center h-[108rpx] px-[32rpx]">
+                <view class="title">收益记录</view>
+                <view class="!ml-auto whitespace-nowrap value"></view>
+                <image class="!w-[16rpx] !ml-[16rpx]" mode="widthFix" :src="Right"></image>
+            </view>
+        </view>
+    </view>
 </template>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.wxts {
+    color: rgb(134, 144, 156);
+    font-size: 24rpx;
+    font-weight: 500;
+    line-height: 22px;
+    letter-spacing: 0;
+}
 </style>
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 0000000000000000000000000000000000000000..92739be988b58a8c21ed7b32e54fd427afe4408b
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`&^I>Eakt
zG3V{<z`SMy0oHQuccE3AS|&UCZ~J>P{hDX)8HYd5uHVYA>6)q_xtUEViFe-CRQ`C~
z!}A-ME-;yJIdEU_5j4Ckw06szgUU)}B|Bvf%QLbrV9gL|5L+<wOpfQZyw;sLZO?9>
zd6x3F{@mVq`>KRmmtW3F`=PvmVGBbq%#af9fY0`eo|W$rt!2(&l!BQM$Pm@w#z;sY
z?bVN)_M*n!vNgY#L^G7%@0*dCie^5K{DIA_;@5+={S7TkJSTSN@5{Js=9oU610UQM
zh$L8hJ!06Fvry#0n)fVMKFro#!YJpTHeVpI@O$;w5|=yP;u8L6r1JL!{A90welhv~
T#7DKjkYw<5^>bP0l+XkKtGJPY

literal 0
HcmV?d00001

diff --git a/src/static/icons/icon-edit-white.png b/src/static/icons/icon-edit-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc50a19d2a0b5b3a2cdc37cf7c7615788fa7dd36
GIT binary patch
literal 551
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)EX7WqAsj$Z!;#X#z`%IV)5S5Q
zV$Rz;v1LsL0&NfVZDS>3XBMX3nCh#~b^J=#&zT1Wo>k{pUGDiHBiI$yV0cU-d5xvu
zOqY~bdu0!+Dh2)%ug<^zFnV6$`dQWaj}x^IC_f4lt#GMX!`R=E&1It`_28%LngiXR
z{!BWipTrxtsjb67I&RZ7^F?g>GXtA;?5w+?^I=ltJ^|g2lV(P`ye+HGV2@DQUmkQO
ze!3Hf;DM`Ec~RvD*!G-W$!F^;+MauPVN3x>f3;cIqf|le4{_`4OWZ1Ea~z2-+wiP>
z^3NmH3>*JdTjb?GY|K8G9pP=$EP2FuhO15U%p<Q2e+#_b+k9xV?#Fp<Hm*m4T~G-%
zCF74$w~N{R``H<e1greKzVC*`_dgX5VjEum4K)YS1z9tmv-6*L_aVjNbxlQs>;i9_
z18f&`<v#pk+EuVO-o}BwB5luk+qP4GC&bmq8F{Ze-LBYvnkC@f^~T`CpAtW=(z0NQ
z?%MnPb*`ZQ%qe$|6}5+dR{Wg5`1qHPv%c$S?v}ZkWp~*)U-yb$gupgE@4O$sefBas
za6AnAZJ{UhZ?)htiQ?FgkvDF0F8*?AAzQ%TySFBCDT>@I`M>M+3&8+M#;IW9>YYpf
kZ{=!BB=;B|TlJgKc)$AlMqXELV9Yaky85}Sb4q9e0R2MtC;$Ke

literal 0
HcmV?d00001

diff --git a/src/static/icons/icon-radio-s.png b/src/static/icons/icon-radio-s.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb9111cf8cd39ce86120124a3f9a09f999153930
GIT binary patch
literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS0009qNkl<Zc%0Q+QIez}3=Lg-uVGKt^vQ5fmi>t%tpoxjh_9-vYg&@LmjoO|
z9ZUcsdI0eB=TCBI|81l1f2o~wF4(c67#2=RFaW?C4w1e10L)3oFc8rrVnjPcL=1Q9
zykLUx9KzkYHH61O`+E}6Av}_e$76lq{CY$T^jR+nL{K6)mc%y1Ye~j%JPDcGs&Q+4
zL2#SED{!d<jA-3@eZ0bRf~?AKb@4k)cw%|A_o@mMpw9P6;&-Se0r{2+X6%(v;2uXE
z1Y7EQC}{8!<423%f%$*c%U!@_ZW3oPB$Y&dJ>YGhQ2kSpLc`c{7d)Z*498Hhk#zy)
z=S<Q0OmGFN@f3H#%GF1~C3wX?S6mMO@S*`BWA{;4(vR9XyqoK**KiiH?fQ*PaK|{8
zpm!Q%$@XXFZ?=^MzVaHGAi+?V2tx5<p2(~NOHKh2_O1;3G;WsUrU9FPt--M>sHL^V
zvskeMsw=+YHrY>hZYVi#1~X4n$S!Gl{}+G59e~FsNgP=`$<~*~IOqQM`Y#0@%JRs{
zocK^X-BsdTI&3HbIft!D5Q-Q3YvtR$1_+2(NzW8d@y>`N3Aos01Mv2eJw`S06jPP}
z9J}L^!^NM#W@yD1@(nLIJ(nYeb8Z6w>8cztsir{OX0qaE@MpxBlHf>?uMB_VF}rGG
zEiT3LF`3qAZa-{$prM2?D71xN*biQy802>G#EsX8oeLoos5c2gNvo7oNC&7)gG#_#
z#25I4bbx9C3O;jCJ>4-}F31gv7L{TA@<fz@4Y$R!6*DA(IAN=ui5s}VCS5?j&q+}6
z+ZeN4RIUrODuu^0e=7b2@#NJ{jB;IIzEEkSx%!DA*9F0zwhlP)Vhv0eJR%9h;>k(r
z9PZ8752D0d)!B+kFyUKhr?!?dhAGe0lQ4zfib=rwOB=epDoL1{h}*ab0-Gk{?)W<i
z>1A%vAcNmqZ#DRFg>qsoH$8r@0ZJtI<5-{HXT+)E6T+kS0Ar)jHG~@^;+ewFphUzc
z2{(Cp8sO{M!`kC6HEeLaK)nt6y1*;}De!tW*k7Ud^t~m=_N}_jLhu>?0S}7?hJ~Tu
QnE(I)07*qoM6N<$g7Q?K761SM

literal 0
HcmV?d00001

diff --git a/src/static/icons/icon-radio.png b/src/static/icons/icon-radio.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fc2ef9abdacd114f8e372ee29e92fa5c0f08e9e
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS0007ONkl<Zc%1E9ZL-233`~15xtVw}>dE%~f!9u(AQi$#>&`f86|$RbDN>oJ
z0st5yGXCvj^HDgq_~-Yw-84;BkCl(1(Ww_qMD(Op<hOVc)k#J+02lxcdT;=2Yn=yF
z5YEB2)?Grl%WU5!5nl**zKy{;K1lr<0M<YHOM)kuBG|>mo``oQ8QJkt$TX`))A$L&
zbprRm<wHORZR>r<%Z?MISAM;V4^ZKW_-Jp6Dky;Bd`A)=P%H_MEoIf%7ea))%k9AG
zQZI*y29wfwXz>Byr|NMRNSUj|xhNoy2PW3&64eh73d+0SO4Z*Y*#+Rw8C#ukVI;fY
ziq#Jgiff37X8#4tw0l+L*bH-P0+qlO^GW2F#W}lA)1<Ow-U^b&`9}6%_6Go%yPN_<
zd{M;&EQ&<B!krwz;lW-bTeH#vHzB&a1Nf}8=A;GA?LP<n#(<lHO#nJx`TZ7xruR&{
z|K;2bcRB?OcW@?t+WXXG(i46^hyCk?X<(E&RYUA2|Ga&(!);Cj=_bNuro@c4<7AJU
z5en8B3OKPW&fZFDz_}<mO=4lM<^rMma#1B0V9+bVsp@YUaV{8cKs;UjO+(2AR-bkm
zNaB+<2rd{R3EAR(Cqw;1EFi|aXlFepL4|L`PUkG83{{@JC!q?z9+QC2n>Nbw`jCXG
ziD<?pA+Ty9TE`D0Qnt*%lg%cB)#@%GrpZ^BPAqjF&wnzIzG>>y`Mrm$Dt<%wOcEsG
zXN2}4Tp<x-3g5#g!i^+cZRs290GPYDy3o3TddckTfGTVMI9?6H7JB2Km(6G4R^6f@
ac#l6P__nKQpW>GQ0000<MNUMnLSTYJ5kHjx

literal 0
HcmV?d00001

diff --git a/src/static/icons/payICON.png b/src/static/icons/payICON.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d53a2f25aa77889a9d96db016b9756cb85b12ef
GIT binary patch
literal 9027
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

literal 0
HcmV?d00001

diff --git a/src/static/icons/right_blue.png b/src/static/icons/right_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d00d5f4a3661c5dcf6eeada8030caee081418c2
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000;O001Zm1^@s6<PADi00004b3#c}2nYxW
zd<bNS0003WNkl<ZNQuqY%@Kky5C!13u?91g1APFk7+OL5fN~t|f%V|eAP~(aS;sv=
z4(}TRNfzKywq<8qcF-u>va=1dZJ2W-WLtJ%9Oi=zjMpPoIRIlOj4Kr=_YDs@00Mxb
z=5ive0&_eGJukEnn%`(3v>eEdtbk|j8y*NKQxPxl3E45a^NGe}z=r^UVN@Z=S0EJ$
z0#cA*AQlk;F^G`@*CSORbj$IHFcdYfVJQFrm!6ytS#I~@DVo>TR{u!tE<L$qAOuMU
zz9CWXKvMrbMXE13Bs>}j4UYmO;bK5_vs2x!RS%rhBh$N*i<(Q{p&uF!c%C3<Z}i*7
zOSN^>YJLrHU!7awAau#?yL9PGYx^_J6#gpBpTKuSA^ZkX&hoRH=q;Q80000<MNUMn
GLSTZEiHPn1

literal 0
HcmV?d00001

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) => {