Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

src/packages/gcszt/router/index.ts

@@ -234,6 +234,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/gstj/router/index.ts

@@ -258,6 +258,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/mobile/views/mine/email/Index.vue

@@ -6,7 +6,7 @@
         </template>
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
             <CellGroup inset>
-                <Field v-model="formData.email" :rules="formRules.email" name="email" label="邮箱"
+                <Field :required="true" v-model="formData.email" :rules="formRules.email" name="email" label="邮箱"
                     placeholder="必填" />
             </CellGroup>
         </Form>

src/packages/mobile/views/mine/wechat/Index.vue

@@ -6,7 +6,7 @@
         </template>
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
             <CellGroup inset>
-                <Field v-model="formData.wechat" :rules="formRules.wechat" name="email" label="微信"
+                <Field :required="true" v-model="formData.wechat" :rules="formRules.wechat" name="email" label="微信"
                     placeholder="必填" />
             </CellGroup>
         </Form>

src/packages/qdhs/router/index.ts

@@ -239,6 +239,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/qxst/router/index.ts

@@ -227,6 +227,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/sbyj/router/index.ts

@@ -237,6 +237,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/sbyj/views/mine/index.vue

@@ -176,6 +176,7 @@ const doInOutMoney = (tab: string) => {
             })
             return
         }
+        // 判断是否已签约
         fullloading((hideLoading) => {
             queryBankAccountSign().then((res) => {
                 hideLoading()

src/packages/tc/router/index.ts

@@ -269,6 +269,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/tjmd/router/index.ts

@@ -270,6 +270,16 @@ const routes: Array<RouteRecordRaw> = [
         props: {
           showCancel: false
         }
+      },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
       }
     ]
   },

src/packages/tjmd/views/mine/Index.vue

@@ -185,6 +185,8 @@ const doInOutMoney = (tab: string) => {
             })
             return
         }
+  
+        // 判断是否已签约
         fullloading((hideLoading) => {
             queryBankAccountSign().then((res) => {
                 hideLoading()

src/packages/zrwyt/router/index.ts

@@ -296,6 +296,16 @@ const routes: Array<RouteRecordRaw> = [
         name: 'mine-setting',
         component: () => import('@mobile/views/mine/setting/Index.vue'),
       },
+      {
+        path: 'wechat',
+        name: 'mine-wechat',
+        component: () => import('@mobile/views/mine/wechat/Index.vue'),
+      },
+      {
+        path: 'email',
+        name: 'mine-email',
+        component: () => import('@mobile/views/mine/email/Index.vue'),
+      }
     ],
   },
   {

src/packages/zrwyt/views/account/certification/components/captcha/Index.vue

@@ -29,7 +29,7 @@ import { useRequestCaptchaVerify } from '@/business/user/account';
 
 <script lang="ts" setup>
 
-import { shallowRef, ref, computed } from 'vue'
+import { shallowRef, ref, computed, onMounted } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, FieldRule, showFailToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useCountDown } from '@vant/use'
@@ -38,7 +38,6 @@ import { getUserInfoType } from '@/services/methods/user'
 const { loading, CaptchaVerifyFormData, onCaptchaVerify } = useRequestCaptchaVerify()
 const { formData, onCaptcaResend } = useRequestCaptcaResend()
 import AppModal from '@/components/base/modal/index.vue'
-import { onActivated } from 'vue';
 
 const showModal = shallowRef(true)
 const refresh = shallowRef(false) // 是否刷新父组件数据
@@ -113,7 +112,8 @@ defineExpose({
     closed,
 })
 
-onActivated(() => {
+onMounted(() => {
+    isCountdown.value = true
     /// 默认倒计时
     countdown.start()
 })

src/packages/zrwyt/views/mine/Index.vue

@@ -176,18 +176,19 @@ const onReady = (el: HTMLDivElement) => {
 
 /// 进行出入金操作判断
 const doInOutMoney = (tab: string) => {
-    /// 当前未签署合同
-    if (!canBankSign.value) {
-        dialog({
-            message: '请先去签署合同条例！',
-            showCancelButton: true,
-            confirmButtonText: '去签署合同'
-        }).then(() => {
-            router.push({ name: 'account-protocol', query: { memberUserId: getMemberUserId()} })
-        })
-        return
-    }
     if (authStatus.value === AuthStatus.Certified) {
+        /// 当前未签署合同
+        if (!canBankSign.value) {
+            dialog({
+                message: '请先去签署合同条例！',
+                showCancelButton: true,
+                confirmButtonText: '去签署合同'
+            }).then(() => {
+                router.push({ name: 'account-protocol', query: { memberUserId: getMemberUserId()} })
+            })
+            return
+        }
+        // 判断是否已签约
         fullloading((hideLoading) => {
             queryBankAccountSign().then((res) => {
                 hideLoading()