Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

config/routes/index.ts

@@ -34,6 +34,15 @@ const memberCenterRoute = {
       path: '/memberCenter/channelAbility',
       redirect: '/memberCenter/channelAbility/infoManage'
     },
+    // 当注册的会员审核不通过时， 可以修改个人信息， 这里任何人都有权限
+    {
+      path: `/memberCenter/editMySelf`,
+      component: '@/pages/member/memberImport/editMySelf',
+      hideInMenu: true,
+      auth: false,
+      noMargin: true,
+      name: '修改个人信息'
+    },
     // {
     //   path: `/memberCenter/home`,
     //   name: 'home',

src/locales/zh-CN/menu.ts

@@ -32,6 +32,7 @@ export default {
   'menu.exception.403': '403',
   'menu.exception.404': '404',
   'menu.exception.500': '500',
+  'menu.editMySelf': '修改个人信息',
 
   // 商品能力
   'menu.commodityAbility': '商品',

src/pages/balance/settleRules/receipt/info.tsx

@@ -105,7 +105,7 @@ const schema = {
           title: '电话号码',
           'x-rules': [
             {limitByte: true, maxByte: 80 },
-            {pattern: /^0\d{2,3}-?\d{7,8}$/, message: '请填写正确的电话号码'}
+            {pattern: /^0\d{2,3}-?\d{7,8}$/, message: '请填写正确的电话号码，格式为：020-12345678'}
           ]
         },
         isDefault: {

src/pages/home/components/UserCenter/index.tsx

@@ -21,7 +21,7 @@ interface Iprops {}
 
 const WEEKDAYS = ["天", "一","二", "三", "四", "五","六"];
 const LEVEL_IMAGE = [level1, level1, level2, level3, level4];
-const EDIT_USER_URL = '/memberCenter/memberAbility/manage/import/editMySelf';
+const EDIT_USER_URL = '/memberCenter/editMySelf';
 const USER_CENTER_URL = '/memberCenter/memberAbility/manage/maintain'
 const STATUS_COLOR: ("default" | "processing" | "error" | "success")[] = ["default", "processing", "error", "success"]
 

src/pages/member/memberImport/components/MemberForm/index.tsx

@@ -124,7 +124,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
           FormPath.setIn(state, 'props.enum', areasOptions);
         });
 
-        areaCodes.forEach((area, index) => {
+        areaCodes && areaCodes.forEach((area, index) => {
           const { pcode, ccode } = area;
           const province = areas.find(item => item.code === pcode);