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

public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appId": "com.muchinfo.app",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "modules": [
     "register",
     "delivery"

src/packages/gcszt/views/account/certification/Index.vue

@@ -58,18 +58,18 @@
 import { shallowRef, onMounted, ref, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule } from 'vant'
-import { fullloading, dialog } from '@/utils/vant';
-import { getIdCardAge } from '@/filters';
+import { fullloading, dialog } from '@/utils/vant'
+import { getIdCardAge } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { queryTencentUsereSignRecords, requestCheckCardNum } from '@/services/api/account';
-import { useRequestBankCard4 } from '@/business/user/account';
-import { validateRules } from '@/constants/regex';
+import { queryTencentUsereSignRecords, requestCheckCardNum } from '@/services/api/account'
+import { useRequestBankCard4 } from '@/business/user/account'
+import { validateRules } from '@/constants/regex'
 import { useUserStore } from '@/stores'
 import { useNavigation } from '@mobile/router/navigation'
 import { getUserId, getMemberUserId, getUserInfoType } from '@/services/methods/user'
-import { decryptAES } from '@/services/websocket/package/crypto';
+import { decryptAES } from '@/services/websocket/package/crypto'
 import { queryBankAccountSign } from '@/services/api/bank'
-import { useQueryCusBankSignBank } from '@/business/bank';
+import { useQueryCusBankSignBank } from '@/business/bank'
 import AppUploader from '@mobile/components/base/uploader/index.vue'
 import AppSelect from '@mobile/components/base/select/index.vue'
 

src/packages/gstj/views/holdbank/holddeposit/Index.vue

@@ -14,11 +14,11 @@
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
             <div class="g-order-list">
                 <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
-                    <div class="g-order-list__titlebar">
-                            <div class="left">
-                                <h5>{{ handleNoneValue(item.billingsnum) }}</h5>
-                            </div>
+                    <!-- <div class="g-order-list__titlebar">
+                        <div class="left">
+                            <h5>{{ handleNoneValue(item.billingsnum) }}</h5>
                         </div>
+                    </div> -->
                     <div class="g-order-list__content">
                         <ul>
                             <li>
@@ -27,26 +27,26 @@
                             </li>
                             <li>
                                 <span>申请时间</span>
-                                <span>{{ formatDate(item.updatetime, 'MM/DD HH:mm') }}</span>
+                                <span>{{ formatDate(item.updatetime, 'YYYYMMDD HH:mm') }}</span>
                             </li>
                             <li>
-                                <span>状态</span>
-                                <span>{{ item.billresult }}</span>
+                                <span>扣费账号</span>
+                                <span>{{ handleNoneValue(item.dgjfhm) }}</span>
                             </li>
                             <li>
-                                <span>备注</span>
-                                <span>{{ handleNoneValue(item.message) }}</span>
+                                <span>状态</span>
+                                <span>{{ item.billresult === '0' ? '扣费成功' : '扣费失败' }}</span>
                             </li>
                             <li>
-                                <span>扣费账号</span>
-                                <span>{{ item.dgjfhm }}</span>
+                                <span>备注</span>
+                                <span>{{ handleNoneValue(item.billresultremark) }}</span>
                             </li>
                         </ul>
                     </div>
                 </div>
             </div>
         </app-pull-refresh>
-        <Calendar v-model:show="showCalendar" type="range" :max-date="new Date()" :min-date="moment().subtract(1, 'years').toDate()" @confirm="onConfirm" />
+        <Calendar v-model:show="showCalendar" type="range" :allow-same-day="true" :max-date="new Date()" :min-date="moment().subtract(1, 'years').toDate()" @confirm="onConfirm" />
         <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent"
             v-if="componentId" />
     </app-view>
@@ -91,7 +91,7 @@ const { loading, pageIndex, pageCount, run, dataList } = useRequest(queryGtwithh
 // 选择日期
 const onConfirm = ([start, end]: Date[]) => {
     showCalendar.value = false
-    dateRange.value = [formatDate(start.toISOString(), 'YYYY-MM-DD'), formatDate(end.toISOString(), 'YYYY-MM-DD')]
+    dateRange.value = [formatDate(start.toISOString(), 'YYYY/MM/DD'), formatDate(end.toISOString(), 'YYYY/MM/DD')]
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
@@ -99,8 +99,8 @@ const onConfirm = ([start, end]: Date[]) => {
 const onRefresh = () => {
     const [begindate, enddate] = dateRange.value
     run({
-        begindate: begindate,
-        enddate: enddate,
+        begindate: formatDate(begindate, 'YYYYMMDD'),
+        enddate: formatDate(enddate, 'YYYYMMDD')
     })
 }
 </script>

src/packages/gstj/views/holdbank/holdsign/Index.vue

@@ -10,6 +10,7 @@
                 <!-- <Cell title="一次扣费限额" :value="handleNoneValue(signinfo?.yckfxe)" /> -->
                 <Cell title="协议签署日期" :value="handleNoneValue(signinfo?.xyqsrq)" />
                 <Cell title="协议生效日期" :value="handleNoneValue(signinfo?.xysxrq)" />
+                <Cell title="协议到期日期" :value="handleNoneValue(signinfo?.xydqrq)" />
                 <Cell title="扣款单位时间" :value="getGt_kksjdwName(signinfo?.kksjdw)" />
                 <Cell title="扣款时间步长" :value="handleNoneValue(signinfo?.kksjbc)" />
                 <!-- <Cell title="扣款周期内扣费限额" :value="handleNoneValue(signinfo?.kkzqnkfxe)" />

src/packages/mobile/views/account/certification/Index.vue

@@ -45,11 +45,13 @@
 import { shallowRef } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule } from 'vant'
 import { addAuthReq } from '@/business/user'
-import { fullloading, dialog } from '@/utils/vant';
-import { getCerTypePersonList } from "@/constants/account";
-import AppSelect from '@mobile/components/base/select/index.vue'
+import { fullloading, dialog } from '@/utils/vant'
+import { getCerTypePersonList } from "@/constants/account"
 import { useNavigation } from '@mobile/router/navigation'
+import { getIdCardAge } from '@/filters'
+import { validateRules } from '@/constants/regex'
 import AppUploader from '@mobile/components/base/uploader/index.vue'
+import AppSelect from '@mobile/components/base/select/index.vue'
 
 const formRef = shallowRef<FormInstance>()
 const { formData, formSubmit, modifyremark } = addAuthReq()
@@ -76,7 +78,15 @@ const formRules: { [key in keyof Model.AddAuthReq]?: FieldRule[] } = {
     cardnum: [{
         required: true,
         message: '请输入证件号码',
-
+        validator: (val) => {
+            if (validateRules.cardno.validate(val)) {
+                if ((getIdCardAge(val) < 18) || (getIdCardAge(val) > 65)) {
+                    return '开户失败，您的年龄不符合开户要求'
+                } 
+                return true
+            }
+            return validateRules.cardno.message
+        }
     }],
     cardbackphotourl: [{
         required: true,

src/packages/pc/views/account/holddeposit/index.vue

@@ -14,6 +14,10 @@
          <template #updatetime="{ value }">
             {{ formatDate(value, 'YYYY/MM/DD HH:MM:SS') }}
         </template>
+         <!-- 状态 -->
+         <template #billresult="{ value }">
+            {{ value === 0 ? '扣费成功' : '扣费失败' }}
+        </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
         v-if="componentId" />
@@ -83,13 +87,13 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'billingsnum', label: '流水号' },
+    // { prop: 'billingsnum', label: '流水号' },
     { prop: 'dgjfhm', label: '扣费账号' },
     { prop: 'deductionbnum', label: '扣费批次号' },
     { prop: 'billamount', label: '入金代扣金额' },
-    { prop: 'updatetime', label: '申请时间' },
     { prop: 'billresult', label: '状态' },
-    { prop: 'message', label: '备注' },
+    { prop: 'updatetime', label: '申请时间' },
+    { prop: 'billresultremark', label: '备注' },
 ])
 
 const onSearch = (clear = false) => {

src/packages/pc/views/account/sign/components/certification/index.vue

@@ -33,8 +33,10 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
-import { getCertificateTypeList } from "@/constants/account";
+import { getCertificateTypeList } from "@/constants/account"
 import { addAuthReq } from '@/business/user'
+import { validateRules } from '@/constants/regex'
+import { getIdCardAge } from '@/filters'
 import AppUpload from '@pc/components/base/upload/index.vue'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
@@ -63,7 +65,16 @@ const formRules: FormRules = {
     cardnum: [{
         required: true,
         message: '请输入证件号码',
-        trigger: 'blur'
+        trigger: 'blur',
+        validator: (rule, value, callback) => {
+            if (validateRules.cardno.validate(value)) {
+                if ((getIdCardAge(value) < 18) || (getIdCardAge(value) > 65)) {
+                    return callback(new Error('开户失败，您的年龄不符合开户要求'))
+                } 
+                return callback()
+            }
+            return callback(new Error(validateRules.cardno.message))
+        }
     }],
     cardbackphotourl: [{
         required: true,

src/packages/qxst/views/account/certification/Index.vue

@@ -46,18 +46,19 @@
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent, onMounted, computed } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule, Image } from 'vant'
-import { fullloading, dialog } from '@/utils/vant';
-import { getFileUrl } from '@/filters';
-import { getAQCertificateTypeList } from "@/constants/account";
+import { fullloading, dialog } from '@/utils/vant'
+import { getFileUrl } from '@/filters'
+import { getAQCertificateTypeList } from "@/constants/account"
 import { useRequest } from '@/hooks/request'
-import { queryUserESignRecord, requestCheckCardNum } from '@/services/api/account';
-import { adddUserReq } from '@/business/user/account';
-import { validateRules } from '@/constants/regex';
+import { queryUserESignRecord, requestCheckCardNum } from '@/services/api/account'
+import { adddUserReq } from '@/business/user/account'
+import { validateRules } from '@/constants/regex'
 import { useComponent } from '@/hooks/component'
 import { useUserStore } from '@/stores'
+import { getIdCardAge } from '@/filters'
+import { useNavigation } from '@mobile/router/navigation'
 import AppSelect from '@mobile/components/base/select/index.vue'
 import AppUploader from '@mobile/components/base/uploader/index.vue'
-import { useNavigation } from '@mobile/router/navigation'
 
 const componentMap = new Map<string, unknown>([
     ['certification-next', defineAsyncComponent(() => import('./components/certification-next/Index.vue'))], // 爱签-实名认证第二步
@@ -122,6 +123,9 @@ const formRules: { [key in keyof Model.AddUserReq]?: FieldRule[] } = {
         message: '请输入证件号码',
         validator: (val) => {
             if (validateRules.cardno.validate(val)) {
+                if ((getIdCardAge(val) < 18) || (getIdCardAge(val) > 65)) {
+                    return '开户失败，您的年龄不符合开户要求'
+                } 
                 return true
             }
             return validateRules.cardno.message

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

@@ -57,19 +57,19 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted, ref, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
-import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule, Image, Cell } from 'vant'
-import { fullloading, dialog } from '@/utils/vant';
-import { getIdCardAge } from '@/filters';
+import { CellGroup, Button, Field, Form, FormInstance, showFailToast, FieldRule } from 'vant'
+import { fullloading, dialog } from '@/utils/vant'
+import { getIdCardAge } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryTencentUsereSignRecords, requestCheckCardNum } from '@/services/api/account';
-import { useRequestBankCard4 } from '@/business/user/account';
-import { validateRules } from '@/constants/regex';
+import { useRequestBankCard4 } from '@/business/user/account'
+import { validateRules } from '@/constants/regex'
 import { useUserStore } from '@/stores'
 import { useNavigation } from '@mobile/router/navigation'
 import { getUserId, getMemberUserId, getUserInfoType } from '@/services/methods/user'
-import { decryptAES } from '@/services/websocket/package/crypto';
+import { decryptAES } from '@/services/websocket/package/crypto'
 import { queryBankAccountSign } from '@/services/api/bank'
-import { useQueryCusBankSignBank } from '@/business/bank';
+import { useQueryCusBankSignBank } from '@/business/bank'
 import AppUploader from '@mobile/components/base/uploader/index.vue'
 import AppSelect from '@mobile/components/base/select/index.vue'
 

src/types/model/bank.d.ts

@@ -518,6 +518,8 @@ declare namespace Model {
         createtime: string
         /// 操作人名称
         czrmc: string
+        /// 批扣结果描述
+        billresultremark: string
         /// 扣费批次号（缴费项目编号_YYYYMMDD_01）
         deductionbnum: string
         /// 缴费号码