upp

后台管理/src/pages/A6record/type.d.ts

@@ -16,6 +16,8 @@ export type A6tableType = {
   province: string
   city: string
   cityStr: string
+  papers: string
+  myIdNum: string
 }
 
 export type A6FromDataType = {

后台管理/src/pages/B2exhiLog/B2look.tsx

@@ -80,8 +80,9 @@ function B2look({ sId, closeFu }: Props) {
               <div className='B2boxrr'>{item.phone}</div>
             </div>
             <div className='B2box'>
-              <div className='B2boxll'>身份证号：</div>
-              <div className='B2boxrr'>{item.identity}</div>
+              <div className='B2boxll B2boxllZZ'>
+                {item.papers || '证件号码'}：<span>{item.identity}</span>
+              </div>
             </div>
           </div>
         ))}

后台管理/src/pages/B2exhiLog/index.module.scss

@@ -50,6 +50,14 @@
           font-weight: 700;
           width: 100px;
         }
+        .B2boxllZZ {
+          width: 100%;
+          word-wrap: break-word;
+          & > span {
+            margin-left: 5px;
+            font-weight: 400;
+          }
+        }
         .B2boxrr {
           width: calc(100% - 100px);
         }

后台管理/src/pages/B2exhiLog/type.d.ts

@@ -23,6 +23,7 @@ export type B2SonListType = {
   name: string
   phone: string
   time: string
+  papers: string
 }
 
 export type B2FromDataType = {

后台管理/src/store/action/A6record.ts

@@ -13,6 +13,7 @@ export const A6_APIgetList = (data: any): any => {
       const arr: A6tableType[] = res.data.records
       arr.forEach(v => {
         v.cityStr = v.province + '-' + v.city
+        v.myIdNum = `${v.papers ? v.papers + '/' : ''}${v.identity}`
       })
       const obj = {
         list: arr,

后台管理/src/utils/tableData.ts

@@ -74,7 +74,7 @@ export const A6tableC = [
   ['txt', '预约课程', 'subjectName'],
   ['txt', '	负责人姓名', 'name'],
   ['txt', '	联系方式', 'phone'],
-  ['txt', '	身份证号', 'identity'],
+  ['txt', '	证件号码', 'myIdNum'],
   ['txt', '	来自地区', 'cityStr'],
   ['txt', '	参团学生人数', 'pcsStudent'],
   ['txt', '	随堂老师人数', 'pcsTeacher'],
@@ -104,7 +104,7 @@ export const B2tableC = [
   ['txt', '申请时间', 'createTime'],
   ['txtChange', '预约类型', 'type', { person: '个人预约', team: '团队预约' }],
   ['txt', '姓名', 'name'],
-  ['txt', '联系电话', 'phone'],
+  ['txt', '联系方式', 'phone'],
   ['txt', '人数', 'pcs'],
   ['txt', '	来自地区', 'cityStr'],
   ['txt', '预约日期', 'bookDate'],

展示端/public/home.html

@@ -60,12 +60,12 @@
       <div class="tit">请选择预约入口</div>
 
       <div class="txt" id="url1">
-        <p>横琴民生事务局</p>
+        <p>琴澳儿童健康生活</p>
         <p>展馆预约</p>
       </div>
       <div class="txt txt2" id="url2">
-        <p>横琴民生事务局</p>
-        <p>健康教育课堂预约</p>
+        <p>琴澳儿童健康教育</p>
+        <p>课堂预约</p>
       </div>
       <br />
       <br />

展示端/src/components/ZselectCity/index.tsx

@@ -12,7 +12,7 @@ type Props = {
 function ZselectCity(_: Props, ref: any) {
   const [visible, setVisible] = useState(false)
 
-  const [value, setValue] = useState<string[]>(['广东省', '珠海市横琴区'])
+  const [value, setValue] = useState<string[]>(['广东省', '横琴粤澳深度合作区'])
 
   // useEffect(() => {
   //   console.log(123, value)

展示端/src/pages/A5order/index.module.scss

@@ -112,6 +112,13 @@
                 border-bottom: 1px solid #bebebe !important;
                 border-radius: 0;
               }
+              // 下拉框
+              .ant-select-selector {
+                border: none;
+                border-bottom: 1px solid #bebebe;
+                box-shadow: none !important;
+                border-radius: 0;
+              }
             }
             .A5llmove {
               label {

展示端/src/pages/A5order/index.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import TopCom from '@/components/TopCom'
 import classNames from 'classnames'
-import { Button, Form, FormInstance, Input, InputNumber } from 'antd'
+import { Button, Form, FormInstance, Input, InputNumber, Select } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { EyeOutlined, CloseOutlined } from '@ant-design/icons'
 import MyPopconfirm from '@/components/MyPopconfirm'
@@ -24,6 +24,7 @@ import {
 import { FileType } from '@/types'
 import { baseURL } from '@/utils/http'
 import ZselectCity from '@/components/ZselectCity'
+import { papersSelArr } from '../B4form/data'
 
 type FormType = {
   name: string
@@ -245,6 +246,7 @@ function A5order() {
                 onFinishFailed={onFinishFailed}
                 autoComplete='off'
                 scrollToFirstError
+                initialValues={{ papers: '内地身份证' }}
               >
                 {/* 第一个卡片 */}
                 <div className='A5lKa'>
@@ -263,29 +265,37 @@ function A5order() {
                     label='联系方式'
                     name='phone'
                     rules={[
-                      { required: true, message: '请输入联系方式!' },
-                      {
-                        pattern: /^1[3-9][0-9]{9}$/,
-                        message: '请输入正确格式的手机号!'
-                      }
+                      { required: true, message: '请输入联系方式!' }
+                      // {
+                      //   pattern: /^1[3-9][0-9]{9}$/,
+                      //   message: '请输入正确格式的手机号!'
+                      // }
                     ]}
                   >
-                    <Input placeholder='请输入11位数字' maxLength={11} />
+                    <Input placeholder='请输入联系方式' maxLength={30} />
                   </Form.Item>
 
                   <Form.Item
-                    label='身份证号'
+                    label='证件类型'
+                    name='papers'
+                    rules={[{ required: true, message: '请选择证件类型!' }]}
+                  >
+                    <Select placeholder='请选择证件类型' options={papersSelArr} />
+                  </Form.Item>
+
+                  <Form.Item
+                    label='证件号码'
                     name='identity'
                     rules={[
-                      { required: true, message: '请输入身份证号!' },
-                      {
-                        pattern:
-                          /^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-                        message: '请输入正确格式的身份证号!'
-                      }
+                      { required: true, message: '请输入证件号码!' }
+                      // {
+                      //   pattern:
+                      //     /^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                      //   message: '请输入正确格式的证件号码!'
+                      // }
                     ]}
                   >
-                    <Input placeholder='请输入18位证件编码' maxLength={18} />
+                    <Input placeholder='请输入证件号码' maxLength={30} />
                   </Form.Item>
                 </div>
 

展示端/src/pages/A6my/index.module.scss

@@ -109,7 +109,7 @@
                 margin-top: 5px;
                 white-space: pre-wrap;
                 word-wrap: break-word;
-                text-align: justify;
+                // text-align: justify;
                 span {
                   font-weight: 700;
                 }

展示端/src/pages/A6my/index.tsx

@@ -127,7 +127,7 @@ function A6my() {
                       {item.phone}
                     </p>
                     <p>
-                      <span>身份证号：</span>
+                      <span>{item.papers || '证件号码'}：</span>
                       {item.identity}
                     </p>
                   </div>

展示端/src/pages/A6my/type.d.ts

@@ -32,4 +32,5 @@ export type A6tableType1 = {
   wxUserId: number
   province: string
   city: string
+  papers: string
 }

展示端/src/pages/A8_1codeAuth/index.tsx

@@ -88,14 +88,14 @@ function A81codeAuth() {
                 label='联系方式'
                 name='phone'
                 rules={[
-                  { required: true, message: '请输入联系方式!' },
-                  {
-                    pattern: /^1[3-9][0-9]{9}$/,
-                    message: '请输入正确格式的手机号!'
-                  }
+                  { required: true, message: '请输入联系方式!' }
+                  // {
+                  //   pattern: /^1[3-9][0-9]{9}$/,
+                  //   message: '请输入正确格式的手机号!'
+                  // }
                 ]}
               >
-                <Input placeholder='请输入11位数字' maxLength={11} />
+                <Input placeholder='请输入联系方式' maxLength={30} />
               </Form.Item>
 
               <Form.Item

展示端/src/pages/A8proof/index.tsx

@@ -138,14 +138,14 @@ function A8proof() {
                 label='联系方式'
                 name='phone'
                 rules={[
-                  { required: true, message: '请输入联系方式!' },
-                  {
-                    pattern: /^1[3-9][0-9]{9}$/,
-                    message: '请输入正确格式的手机号!'
-                  }
+                  { required: true, message: '请输入联系方式!' }
+                  // {
+                  //   pattern: /^1[3-9][0-9]{9}$/,
+                  //   message: '请输入正确格式的手机号!'
+                  // }
                 ]}
               >
-                <Input placeholder='请输入11位数字' maxLength={11} />
+                <Input placeholder='请输入联系方式' maxLength={30} />
               </Form.Item>
 
               <Form.Item

展示端/src/pages/B2myz/index.module.scss

@@ -59,6 +59,7 @@
             }
             & > p {
               margin-top: 2px;
+              word-wrap: break-word;
             }
           }
           .B2row2T {

展示端/src/pages/B2myz/index.tsx

@@ -89,7 +89,9 @@ function B2myz() {
                         {item.type === 'person' ? '参观人' : '负责人'}姓名：{item2.name}
                       </p>
                       <p>联系方式：{item2.phone}</p>
-                      <p>身份证号：{item2.identity}</p>
+                      <p>
+                        {item2.papers || '证件号码'}：{item2.identity}
+                      </p>
                     </div>
                   ))}
 

展示端/src/pages/B2myz/type.d.ts

@@ -27,4 +27,5 @@ export type B2SonListType = {
   name: string
   phone: string
   time: string
+  papers: string
 }

展示端/src/pages/B4form/data.ts

@@ -0,0 +1,6 @@
+export const papersSelArr = [
+  { value: '内地身份证', label: '内地身份证' },
+  { value: '港澳台居民居住证', label: '港澳台居民居住证' },
+  { value: '港澳台居民往来内地通行证', label: '港澳台居民往来内地通行证' },
+  { value: '护照', label: '护照' }
+]

展示端/src/pages/B4form/index.module.scss

@@ -143,6 +143,14 @@
               border-bottom: 1px solid #bebebe !important;
               border-radius: 0;
             }
+
+            // 下拉框
+            .ant-select-selector {
+              border: none;
+              border-bottom: 1px solid #bebebe;
+              box-shadow: none !important;
+              border-radius: 0;
+            }
           }
 
           // 团队信息

展示端/src/pages/B4form/index.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { useParams } from 'react-router-dom'
 import ZexhiBtn from '@/components/ZexhiBtn'
-import { Button, Form, FormInstance, Input, InputNumber } from 'antd'
+import { Button, Form, FormInstance, Input, InputNumber, Select } from 'antd'
 import ZinfoPop from '@/components/ZinfoPop'
 import history from '@/utils/history'
 import classNames from 'classnames'
@@ -13,6 +13,7 @@ import { B3_APIgetList, B4_APIsave } from '@/store/action/all'
 import { B3ListApiType } from '../B3start/type'
 import ZselectCity from '@/components/ZselectCity'
 import TextArea from 'antd/es/input/TextArea'
+import { papersSelArr } from './data'
 
 function B4form() {
   // useEffect(() => {
@@ -99,6 +100,7 @@ function B4form() {
           name: values[`name${v.id}`],
           phone: values[`phone${v.id}`],
           identity: values[`identity${v.id}`],
+          papers: values[`papers${v.id}`],
           province: cityArr[0],
           city: cityArr[1]
         })
@@ -171,6 +173,7 @@ function B4form() {
             onFinishFailed={onFinishFailed}
             autoComplete='off'
             scrollToFirstError
+            initialValues={{ papers1: '内地身份证' }}
           >
             {/* 卡片 */}
             {formArr.map((item, index) => (
@@ -198,7 +201,7 @@ function B4form() {
                 <Form.Item
                   label='姓名'
                   name={`name${item.id}`}
-                  rules={[{ required: true, message: '请输姓名!' }]}
+                  rules={[{ required: true, message: '请输入姓名!' }]}
                   getValueFromEvent={e => e.target.value.replace(/\s+/g, '')}
                 >
                   <Input placeholder='请输入内容，不超过6个字' maxLength={6} />
@@ -208,29 +211,37 @@ function B4form() {
                   label='联系方式'
                   name={`phone${item.id}`}
                   rules={[
-                    { required: true, message: '请输入联系方式!' },
-                    {
-                      pattern: /^1[3-9][0-9]{9}$/,
-                      message: '请输入正确格式的手机号!'
-                    }
+                    { required: true, message: '请输入联系方式!' }
+                    // {
+                    //   pattern: /^1[3-9][0-9]{9}$/,
+                    //   message: '请输入正确格式的手机号!'
+                    // }
                   ]}
                 >
-                  <Input placeholder='请输入11位数字' maxLength={11} />
+                  <Input placeholder='请输入联系方式' maxLength={30} />
                 </Form.Item>
 
                 <Form.Item
-                  label='身份证号'
+                  label='证件类型'
+                  name={`papers${item.id}`}
+                  rules={[{ required: true, message: '请选择证件类型!' }]}
+                >
+                  <Select placeholder='请选择证件类型' options={papersSelArr} />
+                </Form.Item>
+
+                <Form.Item
+                  label='证件号码'
                   name={`identity${item.id}`}
                   rules={[
-                    { required: true, message: '请输入身份证号!' },
-                    {
-                      pattern:
-                        /^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-                      message: '请输入正确格式的身份证号!'
-                    }
+                    { required: true, message: '请输入证件号码!' }
+                    // {
+                    //   pattern:
+                    //     /^[1-9]\d{5}(19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                    //   message: '请输入正确格式的身份证号!'
+                    // }
                   ]}
                 >
-                  <Input placeholder='请输入18位证件编码' maxLength={18} />
+                  <Input placeholder='请输入证件号码' maxLength={30} />
                 </Form.Item>
               </div>
             ))}

平板二维码扫码/src/pages/A2look/index.module.scss

@@ -47,6 +47,14 @@
           font-weight: 700;
           width: 110px;
         }
+        .B2boxllZZ {
+          width: 100%;
+          word-wrap: break-word;
+          & > span {
+            margin-left: 3px;
+            font-weight: 400;
+          }
+        }
         .B2boxrr {
           width: calc(100% - 110px);
         }

平板二维码扫码/src/pages/A2look/index.tsx

@@ -102,8 +102,9 @@ function A2look({ sId, closeFu, type, upTable }: Props) {
               <div className='B2boxrr'>{item.phone}</div>
             </div>
             <div className='B2box'>
-              <div className='B2boxll'>身份证号：</div>
-              <div className='B2boxrr'>{item.identity}</div>
+              <div className='B2boxll B2boxllZZ'>
+                {item.papers || '证件号码'}：<span>{item.identity}</span>
+              </div>
             </div>
           </div>
         ))}

平板二维码扫码/src/pages/A2look/type.d.ts

@@ -5,4 +5,5 @@ export type A2SonListType = {
   name: string
   phone: string
   time: string
+  papers: string
 }