li.shaoyi 1 mese fa
parent
commit
b6d89f931a

+ 12 - 0
src/packages/digital/views/setting/index.less

@@ -0,0 +1,12 @@
+.setting {
+    .app-iconfont {
+        .g-icon {
+            font-size: 16px;
+        }
+
+        &__label {
+            font-size: 14px;
+            margin-left: 10px;
+        }
+    }
+}

+ 6 - 2
src/packages/digital/views/setting/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-view>
+    <app-view class="setting">
         <template #header>
             <app-navbar title="设置" />
             <CellGroup inset style="margin-top: var(--van-padding-md);">
@@ -46,4 +46,8 @@ const userLogout = () => {
         eventBus.$emit('LogoutNotify')
     })
 }
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

+ 1 - 1
src/packages/digital/views/user/login/index.less

@@ -51,7 +51,7 @@
 
     &-footer {
         color: #999;
-        padding: var(--van-padding-md);
+        padding: 0 var(--van-padding-md);
         margin-top: auto;
 
         &__trem {

+ 1 - 1
src/packages/digital/views/wallet/transfer/index.vue

@@ -22,7 +22,7 @@
                 </Field>
                 <Field name="Amount" label="数量" :rules="formRules.Amount">
                     <template #input>
-                        <app-stepper v-model="formData.Amount" />
+                        <app-stepper v-model="formData.Amount" :min="0" />
                     </template>
                 </Field>
                 <Cell title="可用" value="0" />

+ 18 - 7
src/packages/mobile/views/account/certification/Index.vue

@@ -87,6 +87,7 @@
 <script lang="ts" setup>
 import { shallowRef, computed, ref, onMounted } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule, Popup, Picker, PickerConfirmEventParams } from 'vant'
+import { getIdCardAge } from '@/filters'
 import { addAuthReq } from '@/business/user'
 import { fullloading, dialog } from '@/utils/vant'
 import { getCerTypePersonList } from "@/constants/account"
@@ -100,15 +101,22 @@ import AppUploader from '@mobile/components/modules/uploader/index.vue'
 import AppSelect from '@mobile/components/base/select/index.vue'
 import certification from '../../../assets/images/certification.png'
 
-defineProps({
+const props = defineProps({
+    // 是否显示示例
     showExample: {
         type: Boolean,
         default: true
     },
+    // 示例图片
     exampleImage: {
         type: String,
         default: certification
     },
+    // 年龄验证
+    ageCheck: {
+        type: Boolean,
+        default: true
+    }
 })
 
 const formRef = shallowRef<FormInstance>()
@@ -184,14 +192,17 @@ const formRules: { [key: string]: FieldRule[] } = {
     cardnum: [{
         message: t("user.authentication.pleaseenterthecardnum"),
         validator: (val) => {
-            // 待优化
-            // if (getIdCardAge(val)) {
-            //     return t("user.authentication.openfailure")
-            // }
-
             // 任务 #7009
             const enumItem = cerTypePersonList.find((e) => e.enumitemname === formData.cardtype)
-            return (enumItem && new RegExp(enumItem.param1).test(val)) || t('regex.cardno')
+
+            if (enumItem && new RegExp(enumItem.param1).test(val)) {
+                if (props.ageCheck && getIdCardAge(val)) {
+                    return t("user.authentication.openfailure")
+                }
+                return true
+            }
+
+            return t('regex.cardno')
         }
     }],
     cardbackphotourl: [{

+ 3 - 5
src/packages/mobile/views/user/cancel/Index.vue

@@ -13,11 +13,9 @@
                 <dt>{{ $t('user.cancel.tips_6') }}</dt>
             </dl>
         </section>
-        <template #footer>
-            <div class="g-form__footer inset">
-                <Button type="danger" @click="onSubmit" round block>{{ $t('user.cancel.confirmcancellation') }}</Button>
-            </div>
-        </template>
+        <div class="g-form__footer inset">
+            <Button type="primary" @click="onSubmit" round block>{{ $t('user.cancel.confirmcancellation') }}</Button>
+        </div>
     </app-view>
 </template>
 

+ 1 - 2
src/packages/mobile/views/user/cancel/index.less

@@ -1,7 +1,6 @@
 .logoff {
     &__details {
-        background-color: #fff;
-        padding         : 16px;
+        padding: 16px;
 
         h4 {
             font-weight: bold;

+ 2 - 2
src/packages/mobile/views/user/forget/Index.vue

@@ -1,9 +1,9 @@
 <template>
-    <app-view class="g-form forget">
+    <app-view class="g-form">
         <template #header>
             <app-navbar :title="t('user.forget.title')" />
         </template>
-        <Form ref="formRef" class="g-form__container" @submit="formSubmit">
+        <Form ref="formRef" class="g-form__container" style="margin-top: var(--van-padding-md);" @submit="formSubmit">
             <CellGroup :inset="insetStyle">
                 <Field :label="t('user.register.area')" right-icon="arrow" v-if="codeList.length">
                     <template #input>

+ 4 - 6
src/packages/mobile/views/user/password/Index.vue

@@ -3,7 +3,7 @@
         <template #header>
             <app-navbar :title="$t('user.password.title')" />
         </template>
-        <Form ref="formRef" class="g-form__container" @submit="onSubmit">
+        <Form ref="formRef" class="g-form__container" style="margin-top: var(--van-padding-md);" @submit="onSubmit">
             <CellGroup inset>
                 <Field v-model="formData.OldPwd" type="password" name="OldPwd" :label="$t('user.password.oldpwd')"
                     :placeholder="$t('common.required')" autocomplete="off" :rules="formRules.OldPwd" />
@@ -14,11 +14,9 @@
                     :rules="formRules.confirmpassword" />
             </CellGroup>
         </Form>
-        <template #footer>
-            <div class="g-form__footer inset">
-                <Button type="danger" @click="formRef?.submit()" round block>{{ $t('operation.submit') }}</Button>
-            </div>
-        </template>
+        <div class="g-form__footer inset">
+            <Button type="primary" @click="formRef?.submit()" round block>{{ $t('operation.submit') }}</Button>
+        </div>
     </app-view>
 </template>
 

+ 2 - 2
src/packages/mobile/views/user/register/Index.vue

@@ -1,9 +1,9 @@
 <template>
-  <app-view class="g-form register">
+  <app-view class="g-form">
     <template #header>
       <app-navbar :title="t('user.register.title')" :show-back-button="showBackButton" />
     </template>
-    <Form ref="formRef" class="g-form__container register__form" @submit="formSubmit">
+    <Form ref="formRef" class="g-form__container" style="margin-top: var(--van-padding-md);" @submit="formSubmit">
       <CellGroup :inset="insetStyle">
         <Field :label="t('user.register.area')" right-icon="arrow" v-if="codeList.length">
           <template #input>

+ 1 - 1
src/packages/tss/views/account/certification/index.vue

@@ -1,6 +1,6 @@
 <!-- 实名认证 -->
 <template>
-    <PageView :show-example="false" />
+    <PageView :show-example="false" :age-check="false" />
 </template>
 
 <script lang="ts" setup>