Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

hejianhao

2025-03-18 649dd0ee5f8ef78307db97e8e13cf41be60d5bc4

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/manifest.json

@@ -46,6 +46,7 @@
            "sdkConfigs" : {}
        }
    },
    "sassImplementationName": "node-sass",
    /* 快应用特有相关 */
    "quickapp" : {},
    /* 小程序特有相关 */

 H5/utils/request.js

@@ -19,7 +19,8 @@

    return new Promise(function(resolve, reject) {
        let token = uni.getStorageSync('token')
        token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MTgyLCJ0eXBlIjoxLCJleHAiOjE3NDM1MTA1MTgsImNyZWF0ZWQiOjE3NDIyMTQ1MTg5ODJ9.IxRjgKnmvFtuo2acphWhP8f1PMjbA5hQA5lPZlh2EbemrpKQTBk46D-2g-THdMVHqEIcMHg2sVaxntHpbRti9A'
        token =
            'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjE2MjAzLCJ0eXBlIjoxLCJleHAiOjE3NDM1NTY3NTAsImNyZWF0ZWQiOjE3NDIyNjA3NTA2NTV9.YeZ0Bh4gbS0gFddM3NhpiCLJARF6tzeIEAjoGvDhMusFpH1CM6MWnDMtS2iVkmbF0aCrij4N5Ub9HlUqwReASw'
        uni.setStorageSync('token',token)
        let header = {
            'content-type': type ? 'application/x-www-form-urlencoded;charset=UTF-8' : 'application/json',

 management/src/pages/appeal-management/detail.jsx

@@ -199,7 +199,7 @@
                                            ))}
                                        </Descriptions.Item>
                                        <Descriptions.Item label={'上传视频'}>
                                            {detail.complaintComment?.videoUrl && detail.complaintComment?.videoUrl.split(',').map((item, index) => (
                                            {detail.complaintComment?.video && detail.complaintComment?.video.split(',').map((item, index) => (
                                                <video width={280} style={{ marginRight: '10px' }} src={item} key={index} controls></video>
                                            ))}
                                        </Descriptions.Item>

 management/src/pages/party/audit/index.jsx

@@ -145,6 +145,7 @@
          const success = await sendRequest(audit, fileds);
          if (success) {
            handleModalVisible(false);
            message.success('当前党员信息审核已通过');
            addViewRef.current.clean()
            actionRef.current.reload();
          }

 management/src/pages/party/manage/components/addAndEdit.jsx

@@ -49,12 +49,18 @@
  };

  useEffect(() => {
    let adminInfo = JSON.parse(localStorage.getItem('userInfo'))
    setAdminLevel(() => adminInfo.accountLevel)//角色权限1市级2区县3街道4社区5党员

    regionTree({}).then(res => {
      setItems(() => res.data)
    })
    let adminInfo = JSON.parse(localStorage.getItem('userInfo'))
    setAdminLevel(() => adminInfo.accountLevel)//角色权限1市级2区县3街道4社区5党员
    if (adminInfo.accountLevel == 4) {
      form.setFieldsValue({
        community: [adminInfo.communityId.toString()]
      })
    }


    if (searchParams.get('id')) {
      getDetail(searchParams.get('id')).then(res => {
        setUserInfo(() => res.data)
@@ -131,27 +137,60 @@
  }
  const checkIdCard = (rule, value) => {
    const reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
    if (!reg.test(value)) {
    if ((!reg.test(value)) && value) {
      return Promise.reject('请输入正确的身份证号码');
    }
    return Promise.resolve();
  };
  const checkPhone = (rule, value) => {
  const checkPhone = async (rule, value) => {
    const reg = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
    if (!reg.test(value)) {
    if ((!reg.test(value)) && value) {
      return Promise.reject('请输入正确的手机号码');
    }
    if (Object.keys(userInfo).length > 0 && userInfo.phone == value) {
      return Promise.resolve()
    }
    const res = await verifyPhone({ phone:value })
    if (res.data === true) {
      return Promise.reject('该手机号已注册党员信息');
    } else {
    return Promise.resolve();
    }

    
  };
  const checkPhoneUse = (e) => {
  const checkPhoneUse = async (e) => {
    if (Object.keys(userInfo).length > 0 && userInfo.phone == e.target.value) {
      return Promise.resolve()
    }
    verifyPhone({ phone: e.target.value }).then(res => {
      if (res.code != 200) {
        message.warning('该手机号已注册党员信息')
    try {
      const res = await verifyPhone({ phone: e.target.value })
      if (res.data === false) {
        form.setFields([
          {
            name: 'phone',
            errors: ['该手机号已注册党员信息'],
            // touched: true
      }
    })
        ])
      } else {
        form.setFields([
          {
            name: 'phone',
            errors: [],
            touched: true
          }
        ])
      }
    } catch (error) {
      form.setFields([
        {
          name: 'phone',
          errors: ['验证手机号失败，请重试'],
          touched: true
        }
      ])
    }
  }


@@ -172,9 +211,14 @@
                </Form.Item>
                <Form.Item
                  name="phone"
                  label='联系电话' rules={[{ required: true, message: '请输入党员联系电话' }, { validator: checkPhone }]}
                  label='联系电话'
                  validateTrigger={['onBlur']}
                  rules={[
                    { required: true, message: '请输入党员联系电话' },
                    { validator: checkPhone }
                  ]}
                >
                  <Input disabled={searchParams.get('detail')} placeholder='请输入' maxLength={11} onBlur={checkPhoneUse} ></Input>
                  <Input disabled={searchParams.get('detail')} placeholder='请输入' maxLength={11}></Input>
                </Form.Item>
                <Form.Item
                  name="idNumber"